diff options
| author | phk <phk@FreeBSD.org> | 2003-02-01 22:12:50 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2003-02-01 22:12:50 +0000 |
| commit | 63f9efd4bd635141076546e116c8e1541beca31f (patch) | |
| tree | 315fd501c65f8d2e7ec556441fd3a50db90d3188 /release/scripts | |
| parent | ec56adbe77c3b587b58c33cca608928d7974853e (diff) | |
| download | FreeBSD-src-63f9efd4bd635141076546e116c8e1541beca31f.zip FreeBSD-src-63f9efd4bd635141076546e116c8e1541beca31f.tar.gz | |
This took longer to test than expected:
NODEVFS cleanup: don't bother with MAKEDEV.
Look for /boot/boot first, and arrange disklabel arguments accordingly.
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/doFS.sh | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh index 5b5b6b0..0843b4d 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -3,7 +3,7 @@ # $FreeBSD$ # -set -e +set -ex export BLOCKSIZE=512 @@ -26,16 +26,16 @@ FSLABEL=$1 ; shift # so we have to specifically specify -r when we don't have -B. # disklabel fails otherwise. # -if [ -f "${RD}/trees/base/boot/boot1" ]; then +if [ -f "${RD}/trees/base/boot/boot" ]; then + BOOT1="-B -b ${RD}/trees/base/boot/boot" +elif [ -f "${RD}/trees/base/boot/boot1" ]; then BOOT1="-B -b ${RD}/trees/base/boot/boot1" + if [ -f "${RD}/trees/base/boot/boot2" ]; then + BOOT2="-s ${RD}/trees/base/boot/boot2" + fi else BOOT1="-r" fi -if [ -f "${RD}/trees/base/boot/boot2" ]; then - BOOT2="-s ${RD}/trees/base/boot/boot2" -else - BOOT2="" -fi deadlock=20 @@ -107,12 +107,8 @@ dofs_md () { MDDEVICE=`mdconfig -a -t vnode -f ${FSIMG}` if [ ! -c /dev/${MDDEVICE} ] ; then - if [ -f /dev/MAKEDEV ] ; then - ( cd /dev && sh MAKEDEV ${MDDEVICE} ) - else - echo "No /dev/$MDDEVICE and no MAKEDEV" 1>&2 - exit 1 - fi + echo "No /dev/$MDDEVICE" 1>&2 + exit 1 fi disklabel -w ${BOOT1} ${BOOT2} ${MDDEVICE} ${FSLABEL} newfs -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c |
