From: Sascha Wildner <saw@online.de>
Date: Sat, 15 Feb 2020 10:45:24 +0000 (+0100)
Subject: Stop passing "-s labels" to vnconfig(4).
X-Git-Tag: v5.9.0~20
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fc3c0f637bd5ffcb10d14214897adab45182d884

Stop passing "-s labels" to vnconfig(4).

The option is deprecated and has no effect.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 6909453d8f..346cf5856f 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -317,7 +317,7 @@ mkiso:
 	newfs_msdos -C 400k -F 12 -L EFI -m 0xf8 ${ISOROOT}/boot/efiboot.img
 	vnconfig -l | grep "not in use" | head -n 1 | 			\
 	    cut -f 1 -d: > ${ISODIR}/vn.which
-	vnconfig -e -s labels `cat ${ISODIR}/vn.which` ${ISOROOT}/boot/efiboot.img
+	vnconfig -e `cat ${ISODIR}/vn.which` ${ISOROOT}/boot/efiboot.img
 	mount_msdos /dev/`cat ${ISODIR}/vn.which` ${IMGMNT}
 	mkdir -p ${IMGMNT}/EFI/BOOT
 	cp ${ISOROOT}/boot/loader.efi ${IMGMNT}/EFI/BOOT/BOOTX64.EFI
@@ -350,7 +350,7 @@ mkimg:
 	@echo "STEP: determine free vn device"
 	vnconfig -l | grep "not in use" | head -n 1 | 			\
 	    cut -f 1 -d: > ${ISODIR}/vn.which
-	vnconfig -e -s labels `cat ${ISODIR}/vn.which` ${IMGFILE}
+	vnconfig -e `cat ${ISODIR}/vn.which` ${IMGFILE}
 	@echo "STEP: set up legacy MBR"
 	fdisk -b ${ISOROOT}/boot/mbr -IB `cat ${ISODIR}/vn.which`
 	fdisk -s `cat ${ISODIR}/vn.which` >${ISODIR}/fdisk.dat
diff --git a/test/vkernel/Makefile b/test/vkernel/Makefile
index 85640390d7..d2f94feb01 100644
--- a/test/vkernel/Makefile
+++ b/test/vkernel/Makefile
@@ -96,8 +96,7 @@ quickkernel: checkq
 #       have a dependency on mount.
 #
 root:	check
-	vnconfig -c -T -S ${ROOTSIZE} -s labels \
-	    `cat ${VKDIR}/vn.which` ${VKDIR}/root.img
+	vnconfig -c -T -S ${ROOTSIZE} `cat ${VKDIR}/vn.which` ${VKDIR}/root.img
 	dd if=/dev/zero of=/dev/`cat ${VKDIR}/vn.which` bs=32k count=4
 	fdisk -IB `cat ${VKDIR}/vn.which`
 	disklabel -r -w `cat ${VKDIR}/vn.which`s1 auto
@@ -114,7 +113,7 @@ root:	check
 	vnconfig -u `cat ${VKDIR}/vn.which` > /dev/null 2>&1
 
 mount: check
-	vnconfig -c -s labels `cat ${VKDIR}/vn.which` ${VKDIR}/root.img
+	vnconfig -c `cat ${VKDIR}/vn.which` ${VKDIR}/root.img
 .	if ${FSTYPE} == "ufs"
 		fsck -p /dev/`cat ${VKDIR}/vn.which`s1a
 .	endif
@@ -124,7 +123,7 @@ mount: check
 umount: check
 
 fsck: check
-	vnconfig -c -s labels `cat ${VKDIR}/vn.which` ${VKDIR}/root.img
+	vnconfig -c `cat ${VKDIR}/vn.which` ${VKDIR}/root.img
 	fsck -y /dev/`cat ${VKDIR}/vn.which`s1a
 	make umount
 
diff --git a/test/x86_64/Makefile b/test/x86_64/Makefile
index 9038160b5d..110afa8c7d 100644
--- a/test/x86_64/Makefile
+++ b/test/x86_64/Makefile
@@ -149,7 +149,7 @@ quickkernel64: checkq
 #       have a dependency on mount.
 #
 root64:	check
-	vnconfig -c -T -S ${ROOTSIZE} -s labels \
+	vnconfig -c -T -S ${ROOTSIZE} \
 	    `cat ${QEMUDIR}/vn.which` ${QEMUDIR}/root.img
 	dd if=/dev/zero of=/dev/`cat ${QEMUDIR}/vn.which` bs=32k count=4
 	fdisk -IB `cat ${QEMUDIR}/vn.which`
@@ -163,7 +163,7 @@ root64:	check
 	vnconfig -u `cat ${QEMUDIR}/vn.which` > /dev/null 2>&1
 
 mount: check
-	vnconfig -c -s labels `cat ${QEMUDIR}/vn.which` ${QEMUDIR}/root.img
+	vnconfig -c `cat ${QEMUDIR}/vn.which` ${QEMUDIR}/root.img
 	fsck -p /dev/`cat ${QEMUDIR}/vn.which`s1a
 	mount /dev/`cat ${QEMUDIR}/vn.which`s1a ${QEMUDIR}/root
 	@echo "Mounted ${QEMUDIR}/root"