Attachment 8477 Details for Bug 17737 – file.diff

[patch] file.diff

file.diff (text/plain), 3.37 KB, created by oogali on 2000-04-01 22:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oogali

Created: 2000-04-01 22:40:01 UTC

Size: 3.37 KB

patch

obsolete

>--- /usr/src/release/picobsd/build/stage1	Tue Feb  8 03:25:00 2000
>+++ /usr/src/release/picobsd/build/stage1	Fri Mar 31 07:39:38 2000
>@@ -10,4 +10,8 @@
> 
>+# By default, /tmp should exist.
>+#
> MFS_NAME=fs.PICOBSD
>-MFS_MOUNTPOINT=/mnt
>+MFS_MOUNTPOINT=`mktemp -d "/tmp/picobsd.XXXXXXXXXX"`
>+export MFS_MOUNTPOINT
>+
> # fail errno errcode
>@@ -21,3 +25,3 @@
>     no_vnconfig)
>-	echo "Error while doing vnconfig of ${MFS_NAME} on /dev/rvn0..."
>+	echo "Error while doing vnconfig of ${MFS_NAME} on /dev/rvn${VNUM}..."
> 	echo "   Most probably your running kernel doesn't have the vn(4) device."
>@@ -28,3 +32,3 @@
>     no_mount)
>-	echo "Error while mounting ${MFS_NAME} (/dev/vn0c) on ${MFS_MOUNTPOINT}"
>+	echo "Error while mounting ${MFS_NAME} (/dev/vn${VNUM}c) on ${MFS_MOUNTPOINT}"
> 	;;
>@@ -40,3 +44,3 @@
>     vnconfig2)
>-	echo "Error while doing vnconfig of floppy.img on /dev/rvn0..."
>+	echo "Error while doing vnconfig of floppy.img on /dev/rvn${VNUM}..."
> 	;;
>@@ -56,2 +60,4 @@
>     echo "-> Aborting $0"
>+    umount ${MFS_MOUNTPOINT} 2> /dev/null || true
>+    rm -rf ${MFS_MOUNTPOINT} 2> /dev/null || true
>     exit 10
>@@ -63,5 +69,9 @@
>     echo "-> Preparing MFS filesystem..."
>-    umount /dev/vn0 2> /dev/null || true
>+    VNUM=`mount | awk "/vn/ { num++ } END { printf \"%d\", num }"`
>+    export VNUM
>+    echo "-> Using vn${VNUM}..."
>+
>+    umount /dev/vn${VNUM} 2> /dev/null || true
>     umount ${MFS_MOUNTPOINT} 2> /dev/null || true
>-    vnconfig -u /dev/rvn0 2> /dev/null || true
>+    vnconfig -u /dev/rvn${VNUM} 2> /dev/null || true
> 
>@@ -72,3 +82,3 @@
> 
>-    vnconfig -s labels -c /dev/rvn0 ${MFS_NAME} 2>/dev/null || \
>+    vnconfig -s labels -c /dev/rvn${VNUM} ${MFS_NAME} 2>/dev/null || \
> 	    fail $? no_vnconfig
>@@ -80,9 +90,9 @@
>     if [ ${MFS_SIZE} -lt 1024 ] ; then
>-	disklabel -rw /dev/rvn0 fd${MFS_SIZE} || fail $? disklabel
>+	disklabel -rw /dev/rvn${VNUM} fd${MFS_SIZE} || fail $? disklabel
>     else
>-	disklabel -rw vn0 auto || fail $? disklabel
>+	disklabel -rw vn${VNUM} auto || fail $? disklabel
>     fi
> 
>-    newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn0c
>-    mount /dev/vn0c ${MFS_MOUNTPOINT} || fail $? no_mount
>+    newfs -i ${MFS_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c
>+    mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT} || fail $? no_mount
> 
>@@ -148,4 +158,4 @@
>     umount ${MFS_MOUNTPOINT}
>-    fsck -p /dev/rvn0c
>-    vnconfig -u /dev/rvn0
>+    fsck -p /dev/rvn${VNUM}c
>+    vnconfig -u /dev/rvn${VNUM}
> }
>@@ -174,3 +184,3 @@
> 
>-    vnconfig -c /dev/rvn0 picobsd.bin || fail $? vnconfig2
>+    vnconfig -c /dev/rvn${VNUM} picobsd.bin || fail $? vnconfig2
> 
>@@ -179,8 +189,8 @@
>     # XXX todo: use a type matching floppy size.
>-    disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn0 fd1440 || \
>+    disklabel -Brw -b /boot/boot1 -s /boot/boot2 /dev/rvn${VNUM} fd1440 || \
> 	fail $?  disklabel
> 
>-    newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn0c
>+    newfs -i ${FLOPPY_INODES} -m 0 -p 0 -o space /dev/rvn${VNUM}c
> 
>-    mount /dev/vn0c ${MFS_MOUNTPOINT}
>+    mount /dev/vn${VNUM}c ${MFS_MOUNTPOINT}
> 
>@@ -217,3 +227,3 @@
>     files="motd"
>-    echo "-> Copying language dependent files: ${files} -> /mnt/etc ..."
>+    echo "-> Copying language dependent files: ${files} -> ${MFS_MOUNTPOINT}/etc ..."
>     for i in ${files} ; do
>@@ -265,3 +275,4 @@
>     umount ${MFS_MOUNTPOINT}
>-    vnconfig -u /dev/rvn0
>+    rm -rf ${MFS_MOUNTPOINT}
>+    vnconfig -u /dev/rvn${VNUM}
>     # rm kernel.gz ${MFS_NAME}

Actions: View | Diff

Attachments on bug 17737: 8473 | 8474 | 8475 | 8476 | 8477 | 8478 | 8479 | 8480 | 8481 | 8482 | 8483 | 8484 | 8485 | 8486 | 8487 | 8488 | 8489 | 8490 | 8491 | 8492 | 8493 | 8494