svn commit: r366217 - head/tools/boot

[Warner Losh]

Author: imp
Date: Mon Sep 28 06:00:56 2020
New Revision: 366217
URL: https://svnweb.freebsd.org/changeset/base/366217

Log:
  Speciy the dev in an easily changed variable
  
  Rather than hard coding ada0 everywhere, use ${dev}. Also, set
  dev=vtbd0 since both qemu and bhyve support this. More work
  should be done to use labels instead for fstab.
  
  qemu scripts likely need adjustment. And we should also
  likely generate byhve scripts too.

Modified:
  head/tools/boot/rootgen.sh

Modified: head/tools/boot/rootgen.sh
==============================================================================
--- head/tools/boot/rootgen.sh	Mon Sep 28 06:00:39 2020	(r366216)
+++ head/tools/boot/rootgen.sh	Mon Sep 28 06:00:56 2020	(r366217)
@@ -7,6 +7,7 @@ iterations=50000
 
 # The smallest FAT32 filesystem is 33292 KB
 espsize=33292
+dev=vtbd0
 
 #
 # Builds all the bat-shit crazy combinations we support booting from,
@@ -20,7 +21,7 @@ espsize=33292
 # This assumes an external program install-boot.sh which will install
 # the appropriate boot files in the appropriate locations.
 #
-# These images assume ada0 will be the root image. We should likely
+# These images assume ${dev} will be the root image. We should likely
 # use labels, but we don't.
 #
 # Assumes you've already rebuilt... maybe bad? Also maybe bad: the env
@@ -42,7 +43,7 @@ mk_nogeli_gpt_ufs_legacy() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0p2	/		ufs	rw	1	1
+/dev/${dev}p2	/		ufs	rw	1	1
 EOF
     makefs -t ffs -B little -s 200m ${img}.p2 ${src}
     mkimg -s gpt -b ${src}/boot/pmbr \
@@ -56,7 +57,7 @@ mk_nogeli_gpt_ufs_uefi() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0p2	/		ufs	rw	1	1
+/dev/${dev}p2	/		ufs	rw	1	1
 EOF
     make_esp_file ${img}.p1 ${espsize} ${src}/boot/loader.efi
     makefs -t ffs -B little -s 200m ${img}.p2 ${src}
@@ -71,7 +72,7 @@ mk_nogeli_gpt_ufs_both() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0p3	/		ufs	rw	1	1
+/dev/${dev}p3	/		ufs	rw	1	1
 EOF
     make_esp_file ${img}.p1 ${espsize} ${src}/boot/loader.efi
     makefs -t ffs -B little -s 200m ${img}.p3 ${src}
@@ -207,7 +208,7 @@ mk_nogeli_mbr_ufs_legacy() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0s1a	/		ufs	rw	1	1
+/dev/${dev}s1a	/		ufs	rw	1	1
 EOF
     makefs -t ffs -B little -s 200m ${img}.s1a ${src}
     mkimg -s bsd -b ${src}/boot/boot -p freebsd-ufs:=${img}.s1a -o ${img}.s1
@@ -220,7 +221,7 @@ mk_nogeli_mbr_ufs_uefi() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0s2a	/		ufs	rw	1	1
+/dev/${dev}s2a	/		ufs	rw	1	1
 EOF
     make_esp_file ${img}.s1 ${espsize} ${src}/boot/loader.efi
     makefs -t ffs -B little -s 200m ${img}.s2a ${src}
@@ -234,7 +235,7 @@ mk_nogeli_mbr_ufs_both() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0s2a	/		ufs	rw	1	1
+/dev/${dev}s2a	/		ufs	rw	1	1
 EOF
     make_esp_file ${img}.s1 ${espsize} ${src}/boot/loader.efi
     makefs -t ffs -B little -s 200m ${img}.s2a ${src}
@@ -393,7 +394,7 @@ mk_geli_gpt_ufs_legacy() {
 geom_eli_load=YES
 EOF
     cat > ${mntpt}/etc/fstab <<EOF
-/dev/ada0p2.eli	/		ufs	rw	1	1
+/dev/${dev}p2.eli	/		ufs	rw	1	1
 EOF
 
     cp /boot/kernel/geom_eli.ko ${mntpt}/boot/kernel/geom_eli.ko
@@ -429,7 +430,7 @@ mk_geli_gpt_ufs_uefi() {
 geom_eli_load=YES
 EOF
     cat > ${mntpt}/etc/fstab <<EOF
-/dev/ada0p2.eli	/		ufs	rw	1	1
+/dev/${dev}p2.eli	/		ufs	rw	1	1
 EOF
 
     cp /boot/kernel/geom_eli.ko ${mntpt}/boot/kernel/geom_eli.ko
@@ -466,7 +467,7 @@ mk_geli_gpt_ufs_both() {
 geom_eli_load=YES
 EOF
     cat > ${mntpt}/etc/fstab <<EOF
-/dev/ada0p3.eli	/		ufs	rw	1	1
+/dev/${dev}p3.eli	/		ufs	rw	1	1
 EOF
 
     cp /boot/kernel/geom_eli.ko ${mntpt}/boot/kernel/geom_eli.ko
@@ -654,7 +655,7 @@ mk_sparc64_nogeli_vtoc8_ufs_ofw() {
     bios=$7
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0a	/		ufs	rw	1	1
+/dev/${dev}a	/		ufs	rw	1	1
 EOF
     makefs -t ffs -B big -s 200m ${img} ${src}
     md=$(mdconfig -f ${img})
@@ -794,10 +795,7 @@ mkdir -p ${DESTDIR}/boot/kernel
 cp /boot/kernel/kernel ${DESTDIR}/boot/kernel
 echo -h -D -S115200 > ${DESTDIR}/boot.config
 cat > ${DESTDIR}/boot/loader.conf <<EOF
-console=comconsole
 comconsole_speed=115200
-boot_serial=yes
-boot_multicons=yes
 EOF
 # XXX
 cp /boot/device.hints ${DESTDIR}/boot/device.hints