Booting USB kernel with duid and added more sd devices to make bootin…

…g on USB-stick more compatible with different hardware

build-usbimage.sh

@@ -106,6 +106,15 @@ echo "Installing disklabel..."
 ${SUDO} disklabel -R $DEVICE $TEMPFILE
 rm $TEMPFILE
 
+echo ""
+echo "Setting duid with disklabel..."
+${SUDO} disklabel -E $DEVICE << __EOC >/dev/null
+i
+0123456789abcdef
+write
+quit
+__EOC
+
 echo ""
 echo "Creating new filesystem..."
 ${SUDO} newfs -q /dev/r${DEVICE}a

build-usbkernel.sh

@@ -87,7 +87,7 @@ gzip -c9 ${CWD}/${WORKDIR}/obj/bsd.rd > ${CWD}/${WORKDIR}/obj/bsd.gz
 # Clean up
 rm -rf ${CWD}/${WORKDIR}/dev/*
 rm -r ${CWD}/obj/*
-#rm -f list.temp
+rm -f list.temp
 rm -f $KERNEL
 
 # Move kernel files from sandbox to the "old" location as before chroot

initial-conf/fstab.initial.usb

@@ -1,2 +1,2 @@
 /dev/rd0a	/	ffs	rw				0 0
-/dev/sd0a	/flash	ffs	ro,sync,noatime			0 1
+0123456789abcdef.a	/flash	ffs	ro,sync,noatime			0 1

list

@@ -6,6 +6,7 @@ SPECIAL cd dev; ./MAKEDEV ttyU0 ttyU1
 SPECIAL cd dev; ./MAKEDEV tun0 tun1 tun2 tun3 tun4 tun5 tun6 tun7
 SPECIAL cd dev; ./MAKEDEV bpf0 bpf1 bpf2 bpf3 bpf4 bpf5 bpf6 bpf7 
 SPECIAL cd dev; ./MAKEDEV pf crypto fd wsmux wscons apm local gpio
+SPECIAL cd dev; ./MAKEDEV sd1 sd2 sd3 sd4 sd5 sd6 sd7 sd8 sd9
 
 COPY	${DESTDIR}/etc/disktab			etc/disktab
 COPY	${DESTDIR}/etc/login.conf		etc/login.conf