Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VND_CDEV -> VND.

Browse Source 
Properly write disklabel.
This commit is contained in:
minoura 2002-01-07 04:47:10 +00:00
parent 4d762e1938
commit 49a2f3f4c6
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
distrib/x68k/floppies/bootfloppy-common/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.18 2001/12/07 06:57:49 minoura Exp $
# $NetBSD: Makefile.inc,v 1.19 2002/01/07 04:47:10 minoura Exp $
# TOP is assumed to be defined by Makefile including this one.
@ -19,8 +19,6 @@ IMAGE1?= ${BASENAME}1.fs
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}c
VND_CRDEV= /dev/r${VND}c
MDEC= ${DESTDIR}/usr/mdec
FSTMP= ustar.fs
@ -37,12 +35,12 @@ realall: netbsd ${BOOTNAME}
@echo Making disk number one
-mv -f ${IMAGE1} ${IMAGE1}.tmp
dd if=/dev/zero of=${IMAGE1}.tmp count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CRDEV} ${IMAGE1}.tmp
disklabel -rw ${VND_CRDEV} ${DISKTYPE}
vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE1}.tmp
disklabel -rw ${VND} ${DISKTYPE}
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_RDEV}
@echo "installing new bootblocks"
${MDEC}/installboot.new -v ${MDEC}/fdboot_ustar ${VND_RDEV}
vnconfig -u ${VND_CRDEV}
vnconfig -u ${VND}
@ls -l ${FSTMP} | (read mode links uid gid size junk; \
dksize=$$((${DISKSIZE} * 512 - 8 * 1024)); \
disks=$$(($$size / $$dksize + 1)); \
@ -77,7 +75,7 @@ realall: netbsd ${BOOTNAME}
mv -f ${IMAGE1}.tmp ${IMAGE1}
unconfig:
-vnconfig -u ${VND_RDEV}
-vnconfig -u ${VND}
${BOOTNAME}:
cp -fp ${MDEC}/boot ${BOOTNAME}

15
distrib/x68k/floppies/ramdisk-common/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.5 2001/12/07 06:57:50 minoura Exp $
# $NetBSD: Makefile.inc,v 1.6 2002/01/07 04:47:10 minoura Exp $
.include "${TOP}/Makefile.inc"
@ -9,8 +9,6 @@ MOUNT_POINT?= /mnt
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}c
VND_CRDEV= /dev/r${VND}c
IMAGE?= xxx.fs
MDEC= ${DESTDIR}/usr/mdec
@ -28,7 +26,9 @@ RAMDISKGEOM= 512/${RAMDISKSPT}/${RAMDISKHEADS}/${RAMDISKCYLS}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
dd if=/dev/zero of=${IMAGE} count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CRDEV} ${IMAGE} ${RAMDISKGEOM}
vnconfig -v -c ${VND} ${IMAGE} ${RAMDISKGEOM}
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -B be -m 0 -o space -i ${RAMDISKBPI} -c ${RAMDISKCPG} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
@ -39,11 +39,11 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CRDEV}
vnconfig -u ${VND}
unconfig:
-umount -f ${MOUNT_POINT}
-vnconfig -u ${VND_RDEV}
-vnconfig -u ${VND}
-/bin/rm -f ${IMAGE}
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
@ -71,4 +71,5 @@ depend:
release:
clean cleandir distclean:
/bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
if [ -f ${CBIN}.mk ]; then ${MAKE} -f ${CBIN}.mk clean; fi
/bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c tmplabel