fix problems with xorriso-usb related to creating a grandchild

1 files changed, 38 insertions, 9 deletions

diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 6cada5e..100288d 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -12,7 +12,7 @@ efi_dir=$samizdat_grub_efi_dir
 
 die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
 
-TEMP="$(getopt -o '' --long adam,usb,detach,out:,test -n "$0" -- "$@")" ||
+TEMP="$(getopt -o '' --long adam,usb,detach,in:,out:,test -n "$0" -- "$@")" ||
     die 'getopt error'
 eval set -- "$TEMP"
 
@@ -24,13 +24,18 @@ while [ $# -gt 0 ]; do
         --detach) shift; DETACH=y;;
         --test)   shift; QUICK_TEST=y;;
         --out)    CMDLINE_OUTDEV="$2"; shift 2;;
+        --in)     INPUT_DEVICE="$2"; shift 2;;
         --)       shift; break;;
         *) die 'getopt error';;
     esac
 done
 
-if [ $# = 0 ]; then
-    set -- debian-live-8.4.0-amd64-standard.btrfs layer.btrfs
+if [ -z "$INPUT_DEVICE" -a $# = 0 ]; then
+    if [ -e debian-live-8.4.0-amd64-standard.btrfs -a -e layer.btrfs ]; then
+        set -- debian-live-8.4.0-amd64-standard.btrfs layer.btrfs
+    else
+        die "no input device and no input btrfs layers: aborting."
+    fi
 fi
 
 for fs; do
@@ -125,10 +130,28 @@ choose_outdev
 
 generate_keys
 
+try_mount()
+{
+    # TODO: don't use /mnt
+    # Ofc the real solution is to get help with xorriso.
+    NEED_UNMOUNT="$1"
+    mount -r "$1" /mnt && trap 'umount -l /mnt' EXIT
+}
+
 if [ "$INPUT_DEVICE" ]; then
-    REPLACE_INITRD=
-    REMOVE_BTRFS=
-    ADD_BTRFS=
+    if [ "$INPUT_DEVICE" = /dev/md55 ]; then
+        if mountpoint -q /cdrom; then
+            XORRISO_IS_DRIVING_ME_INSANE='-add /=/cdrom --'
+        fi
+    elif [ -d "$INPUT_DEVICE" ]; then
+        XORRISO_IS_DRIVING_ME_INSANE="-add /=$INPUT_DEVICE --" # TODO: escape
+    elif try_mount "$INPUT_DEVICE"; then
+        XORRISO_IS_DRIVING_ME_INSANE='-add /=/mnt --'
+    else
+        REPLACE_INITRD=
+        REMOVE_BTRFS=
+        ADD_BTRFS=
+    fi
 else
     REPLACE_INITRD=y
     REMOVE_BTRFS=y
@@ -144,19 +167,24 @@ if [ "$REPLACE_INITRD" ]; then
     initrd.sh || die 'initrd.sh failed'
 fi
 
+SILENT=
+
 (set -x
 xorriso \
-        ${INPUT_DEVICE:+ -indev "$INPUT_DEVICE" } \
+        ${disable____INPUT_DEVICE:+ -indev "$INPUT_DEVICE" } \
         -outdev ${NEED_STDIO:+stdio:}"$outdev" \
         -blank as_needed \
-        -report_about mishap \
+        ${SILENT:+ -report_about mishap} \
         -return_with sorry 0 \
         -volid "$volid" \
         -pathspecs on \
         \
         \
+        ${XORRISO_IS_DRIVING_ME_INSANE} \
+        \
+        \
         ${REPLACE_INITRD:+ -rm_r linux -- -add linux="${vmlinuz_dir}" -- } \
-        ${REMOVE_BTRFS:+   -rm_r btrfs -- } \
+        ${REMOVE_BTRFS:+   -rm_r rootfs -- } \
         ${ADD_BTRFS:+      -follow link -add "$@" -- -follow default } \
         \
         \
@@ -175,6 +203,7 @@ xorriso \
         --embedded-boot "${efi_dir}"/embedded.img \
         --protective-msdos-label \
         grub="${efi_dir}"/grub
+
 ) || die "xorriso exited $?"
 
 case "$outdev" in