Edits

Author: gitbls

sdm-cmdsubs

@@ -291,6 +291,7 @@ function sdm_burndevfile() {
     declare -x SDMNSPAWN="Burn0"
     declare -a burnmsg
     fpartcopy=0
+    write_burnmsg "* Start Burn"
     burnstart="$(getcdate)"
     newdiskid="$(printf  "%08x" "$(((RANDOM*RANDOM*RANDOM*RANDOM+RANDOM)&0xFFFFFFFF))")"
     if [ $burn -eq 1 ]
@@ -300,8 +301,6 @@ function sdm_burndevfile() {
 	#
 	[ "$burndev" == "" ] && errexit "? No storage device specified"
 	[ ! -b $burndev ] && errexit "? '$burndev' is not a block device"
-	dtype=$(lsblk -n -o type $burndev 2>/dev/null | head -n 1)
-	[[ "$dtype" == "" ]] || [[ "$dtype" != "disk" ]] && errexit "? '$burndev' is not a block device"
 	perr=0
 	for p in 1 2 3 4 5 6 7 8
 	do
@@ -311,7 +310,6 @@ function sdm_burndevfile() {
 	[ $perr -eq 1 ] && errexit "? Use 'sudo umount' to unmount each mounted partition, then redo the burn command"
 	notmounted $burndev || errexit "? Device '$burndev' is mounted"   # one last check
 	! sfdisk -l $burndev >/dev/null 2>&1 && errexit "? Cannot access '$burndev'; is there a disk in the drive?"
-	write_burnmsg "* Start Burn"
 	bsize=$(stat --printf %s $dimg)
 	write_burnmsg "> Burn '$dimg' $(getgbstr $bsize) to '$burndev'..."
 	diskbytes=$(getdiskbytes $burndev)
@@ -382,7 +380,6 @@ EOF
 	#
 	[ "$burnfilefile" == "" ] && errexit "? No Output IMG file specified"
 	[ -f $burnfilefile ] && errexit "? Output IMG file '$burnfilefile' exists"
-	write_burnmsg "* Start Burn"
 	bsize=$(stat --printf %s $dimg)
 	write_burnmsg "* Burn '$dimg' $(getgbstr $bsize) to IMG '$burnfilefile'..."
 	burnmsg+=("$(thisdate) > Burn IMG command line: $cmdline")
@@ -430,7 +427,7 @@ EOF
 	# and to $SDMPT/etc/sdm/history in the mounted image or image file
 	#
 	xsettings="autologin b0script b1script bootscripts burnplugins domain expandroot exports fchroot hname fredact fnoexpandroot myuser noreboot"
-	xsettings="$xsettings nowaittimesync plugindebug plugins reboot rebootwait regensshkeys"
+	xsettings="$xsettings nowaittimesync plugindebug plugins reboot rebootwait regensshkeys xspdev"
 	# Save settings made with the --burn command
 	# Define variable b<varname> for each <varname>
 	for e in $xsettings
@@ -456,6 +453,7 @@ EOF
 	regensshkeys=$((bregensshkeys|regensshkeys))
 	nowaittimesync=$((bnowaittimesync|nowaittimesync))
 	plugindebug=$((bplugindebug|plugindebug))
+	xspdev=$bxspdev   # Pass on host setting
 	[ "$hname" == "" ] && write_burnmsg "% hostname not specified with --host; will not be written"
 	# --bupdate must specified on the burn command line
 	initvirt logtoboth  # Must be done after fchroot is set