diff options
Diffstat (limited to 'src/xorriso-usb.sh')
-rw-r--r-- | src/xorriso-usb.sh | 9 |
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 | |||
31 | esac | 31 | esac |
32 | done | 32 | done |
33 | 33 | ||
34 | if [ -z "$INPUT_DEVICE" -a $# = 0 -a -z "$BOOTLOADER_ONLY" ]; then | 34 | if [ "$INPUT_DEVICE" ]; then |
35 | die "support for --in is disabled because xorriso needs different arguments to produce a bootable image" | ||
36 | |||
37 | elif [ $# = 0 -a -z "$BOOTLOADER_ONLY" ]; then | ||
35 | if mountpoint -q /cdrom; then | 38 | if mountpoint -q /cdrom; then |
36 | INPUT_DEVICE=/cdrom | 39 | INPUT_DEVICE=/cdrom |
37 | elif [ -e debian-live-8.4.0-amd64-standard.btrfs -a -e layer.btrfs ]; then | 40 | elif [ -e debian-live-8.4.0-amd64-standard.btrfs -a -e layer.btrfs ]; then |
@@ -100,7 +103,7 @@ choose_usb() | |||
100 | 103 | ||
101 | choose_cdrom() | 104 | choose_cdrom() |
102 | { | 105 | { |
103 | die 'choose_cdrom: unimplemented' | 106 | die 'choose_cdrom: unimplemented; specify cdrom device with --out' |
104 | } | 107 | } |
105 | 108 | ||
106 | choose_outdev() | 109 | choose_outdev() |
@@ -192,7 +195,7 @@ SILENT= | |||
192 | 195 | ||
193 | (set -x | 196 | (set -x |
194 | xorriso \ | 197 | xorriso \ |
195 | ${disable____INPUT_DEVICE:+ -indev "$INPUT_DEVICE" } \ | 198 | ${INPUT_DEVICE:+ -indev "$INPUT_DEVICE" } \ |
196 | -outdev ${NEED_STDIO:+stdio:}"$outdev" \ | 199 | -outdev ${NEED_STDIO:+stdio:}"$outdev" \ |
197 | -blank as_needed \ | 200 | -blank as_needed \ |
198 | ${SILENT:+ -report_about mishap} \ | 201 | ${SILENT:+ -report_about mishap} \ |