From ef561d2ac23088a77eea0881f91ab063025c8f2d Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 5 May 2020 19:27:51 -0400 Subject: fix kernel commandline on cdrom boot --- src/grub-efi.sh | 7 ++++++- src/xorriso-usb.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src') 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;; -- cgit v1.2.3