disklabel(8) is spelled bsdlabel(8) or sunlabel(8) these days.

Also make sure bsdlabel(8) (along with the disklabel(8) compat
link) still appear on the fixit floppies of platforms that use
it natively (alpha, i386, and pc98).

Approved by:	re (scottl)
This commit is contained in:
Ruslan Ermilov 2003-05-17 19:16:28 +00:00
parent c1941005a3
commit 5795760c45
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=115106
9 changed files with 22 additions and 13 deletions

View File

@ -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 -

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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