xorriso: disable "--in" with message; improve message for (already disabled) interactive cdrom choosing

1 files changed, 6 insertions, 3 deletions

diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index e912080..2b3214f 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -31,7 +31,10 @@ while [ $# -gt 0 ]; do
     esac
 done
 
-if [ -z "$INPUT_DEVICE" -a $# = 0 -a -z "$BOOTLOADER_ONLY" ]; then
+if [ "$INPUT_DEVICE" ]; then
+    die "support for --in is disabled because xorriso needs different arguments to produce a bootable image"
+
+elif [ $# = 0 -a -z "$BOOTLOADER_ONLY" ]; then
     if mountpoint -q /cdrom; then
         INPUT_DEVICE=/cdrom
     elif [ -e debian-live-8.4.0-amd64-standard.btrfs -a -e layer.btrfs ]; then
@@ -100,7 +103,7 @@ choose_usb()
 
 choose_cdrom()
 {
-    die 'choose_cdrom: unimplemented'
+    die 'choose_cdrom: unimplemented; specify cdrom device with --out'
 }
 
 choose_outdev()
@@ -192,7 +195,7 @@ SILENT=
 
 (set -x
 xorriso \
-        ${disable____INPUT_DEVICE:+ -indev "$INPUT_DEVICE" } \
+        ${INPUT_DEVICE:+ -indev "$INPUT_DEVICE" } \
         -outdev ${NEED_STDIO:+stdio:}"$outdev" \
         -blank as_needed \
         ${SILENT:+ -report_about mishap} \