diff options
| -rw-r--r-- | release/Makefile | 4 | ||||
| -rw-r--r-- | release/alpha/fixit_crunch.conf | 5 | ||||
| -rw-r--r-- | release/amd64/fixit_crunch.conf | 5 | ||||
| -rw-r--r-- | release/i386/fixit_crunch.conf | 5 | ||||
| -rw-r--r-- | release/ia64/doFS.sh | 2 | ||||
| -rw-r--r-- | release/pc98/fixit-small_crunch.conf | 5 | ||||
| -rw-r--r-- | release/pc98/fixit_crunch.conf | 5 | ||||
| -rw-r--r-- | release/scripts/doFS.sh | 2 | ||||
| -rw-r--r-- | release/sparc64/mkisoimages.sh | 2 |
9 files changed, 22 insertions, 13 deletions
diff --git a/release/Makefile b/release/Makefile index ee984af..ea40d16 100644 --- a/release/Makefile +++ b/release/Makefile @@ -216,7 +216,11 @@ MFSLABEL= auto MFSSIZE= 8192 .endif +.if exists(/sbin/bsdlabel) +DISKLABEL?= bsdlabel +.else DISKLABEL?= disklabel +.endif ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k - diff --git a/release/alpha/fixit_crunch.conf b/release/alpha/fixit_crunch.conf index 6ee7720..c44e74d 100644 --- a/release/alpha/fixit_crunch.conf +++ b/release/alpha/fixit_crunch.conf @@ -7,9 +7,10 @@ progs cat chflags chmod cp dd df echo expr kill progs ln ls mkdir mv rm rmdir srcdirs /usr/src/sbin -progs clri disklabel dmesg mknod +progs bsdlabel clri dmesg mknod progs mount mount_cd9660 progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore srcdirs /usr/src/usr.bin @@ -19,4 +20,4 @@ srcdirs /usr/src/usr.sbin progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil diff --git a/release/amd64/fixit_crunch.conf b/release/amd64/fixit_crunch.conf index 19f428a..45ad00e 100644 --- a/release/amd64/fixit_crunch.conf +++ b/release/amd64/fixit_crunch.conf @@ -7,9 +7,10 @@ progs cat chmod cp dd df echo expr kill progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore srcdirs /usr/src/usr.bin @@ -21,4 +22,4 @@ srcdirs /usr/src/usr.sbin progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil diff --git a/release/i386/fixit_crunch.conf b/release/i386/fixit_crunch.conf index 19f428a..45ad00e 100644 --- a/release/i386/fixit_crunch.conf +++ b/release/i386/fixit_crunch.conf @@ -7,9 +7,10 @@ progs cat chmod cp dd df echo expr kill progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore srcdirs /usr/src/usr.bin @@ -21,4 +22,4 @@ srcdirs /usr/src/usr.sbin progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil diff --git a/release/ia64/doFS.sh b/release/ia64/doFS.sh index 6c2aa1e..98f6d09 100644 --- a/release/ia64/doFS.sh +++ b/release/ia64/doFS.sh @@ -20,7 +20,7 @@ FSLABEL=$1 ; shift if [ x$FSLABEL != "xefi" ]; then DOFS_SH=`dirname $0`/../scripts/`basename $0` echo "Transferring control to $DOFS_SH..." - exec sh $DOFS_SH disklabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL + exec sh $DOFS_SH bsdlabel ia64 $FSIMG $RD $MNT $FSSIZE $FSPROTO $FSINODE $FSLABEL fi export BLOCKSIZE=512 diff --git a/release/pc98/fixit-small_crunch.conf b/release/pc98/fixit-small_crunch.conf index 9d04ce3..7303f54 100644 --- a/release/pc98/fixit-small_crunch.conf +++ b/release/pc98/fixit-small_crunch.conf @@ -7,9 +7,10 @@ progs cat chmod cp dd df echo expr kill progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore special fdisk srcdir /usr/src/sbin/fdisk_pc98 @@ -22,4 +23,4 @@ srcdirs /usr/src/usr.sbin progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil diff --git a/release/pc98/fixit_crunch.conf b/release/pc98/fixit_crunch.conf index e633ad4..9e43c68 100644 --- a/release/pc98/fixit_crunch.conf +++ b/release/pc98/fixit_crunch.conf @@ -7,9 +7,10 @@ progs cat chmod cp dd df echo expr kill progs ln ls mkdir mv rm rmdir sleep sync srcdirs /usr/src/sbin -progs clri disklabel dmesg fdisk mknod +progs bsdlabel clri dmesg fdisk mknod progs mount mount_cd9660 mount_msdosfs progs reboot restore swapon umount +ln bsdlabel disklabel ln restore rrestore special fdisk srcdir /usr/src/sbin/fdisk_pc98 @@ -23,4 +24,4 @@ srcdirs /usr/src/usr.sbin progs chown chroot ln chown chgrp -libs -lutil -lm -ledit -lncurses -ltermcap -lkvm +libs -ledit -lgeom -lkvm -lm -lncurses -lutil diff --git a/release/scripts/doFS.sh b/release/scripts/doFS.sh index 28d2dac..b499e1d 100644 --- a/release/scripts/doFS.sh +++ b/release/scripts/doFS.sh @@ -20,7 +20,7 @@ FSLABEL=$1 ; shift # # We don't have any bootblocks on ia64. Note that -B implies -r, # so we have to specifically specify -r when we don't have -B. -# disklabel fails otherwise. +# bsdlabel fails otherwise. # if [ -f "${RD}/trees/base/boot/boot" ]; then BOOT="-B -b ${RD}/trees/base/boot/boot" diff --git a/release/sparc64/mkisoimages.sh b/release/sparc64/mkisoimages.sh index 437753b..323531e 100644 --- a/release/sparc64/mkisoimages.sh +++ b/release/sparc64/mkisoimages.sh @@ -30,7 +30,7 @@ MNT=/mnt if [ "x$1" = "x-b" ]; then dd if=/dev/zero of=${IMG} bs=512 count=1024 MD=`mdconfig -a -t vnode -f ${IMG}` - disklabel -Brw ${MD} auto + sunlabel -Brw ${MD} auto newfs /dev/${MD}c mount /dev/${MD}c ${MNT} mkdir ${MNT}/boot |
