fix kernel commandline on cdrom boot

2 files changed, 7 insertions, 2 deletions

diff --git a/src/grub-efi.sh b/src/grub-efi.sh
index 611e85f..350c28d 100755
--- a/src/grub-efi.sh
+++ b/src/grub-efi.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 . samizdat-paths.sh
 
-linux_kernel_commandline='boot=samizdat components quiet nbdroot=192.168.10.1/samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
+if [ "$BOOTLOADER_ONLY" ]
+then
+  linux_kernel_commandline='boot=samizdat components quiet nbdroot=192.168.10.1/samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
+else
+  linux_kernel_commandline='boot=samizdat components quiet'
+fi
 
 grub_config()
 {
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index b811c7f..594ff78 100755
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -195,7 +195,7 @@ while [ $# -gt 0 ]; do
     case "$1" in
         --)             shift; break;;
         --adam)         shift; ADAM=y;;
-        --bootloader)   shift; BOOTLOADER_ONLY=y;;
+        --bootloader)   shift; export BOOTLOADER_ONLY=y;;
         --cdrom)        shift; USB=;;
         --detach)       shift; DETACH=y;;
         --in)           INPUT_DEVICE="$2"; shift 2;;