1 files changed, 69 insertions, 69 deletions

diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 511ba0e..a42764b 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -1,66 +1,5 @@
 #!/bin/bash
 
-. samizdat-paths.sh || exit 1
-
-outdev=
-volid=SamizdatLive
-gpg_iso_path=gnupghome
-gnupghome=
-child_dir=$samizdat_child_dir/child.$$
-vmlinuz_dir=$samizdat_linux_dir
-efi_dir=$samizdat_grub_efi_dir
-
-die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
-
-TEMP="$(getopt -o '' --long bootloader,reuse-child:,adam,usb,detach,in:,out:,test -n "$0" -- "$@")" ||
-    die 'getopt error'
-eval set -- "$TEMP"
-
-ADAM=; DETACH=; USB=y
-while [ $# -gt 0 ]; do
-    case "$1" in
-        --adam)   shift; ADAM=y;;
-        --bootloader) shift; BOOTLOADER_ONLY=y;;
-        --cdrom)    shift; USB=;;
-        --detach) shift; DETACH=y;;
-        --test)   shift; QUICK_TEST=y;;
-        --out)    CMDLINE_OUTDEV="$2"; USB=; shift 2;;
-        --in)     INPUT_DEVICE="$2"; shift 2;;
-        --reuse-child) REUSE_CHILD=y; child_dir=$samizdat_child_dir/child."$2"; shift 2;;
-        --)       shift; break;;
-        *) die 'getopt error';;
-    esac
-done
-
-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
-        set -- debian-live-8.4.0-amd64-standard.btrfs layer.btrfs
-    elif [ -e /srv/nbd.btrfs ]; then
-        set -- /srv/nbd.btrfs
-    elif [ "$(blockdev --getsz /dev/nbd0)" -gt 0 ]; then
-        (set -x; dd if=/dev/nbd0 of=/srv/nbd.btrfs~ && mv /srv/nbd.btrfs~ /srv/nbd.btrfs) || die "failed to copy network block device"
-        set -- /srv/nbd.btrfs
-    else
-        die "no input device and no input btrfs layers: aborting."
-    fi
-fi
-
-for fs; do
-    [ -f "$fs" ] || die "not a file: $fs"
-    case "$fs" in
-        *.btrfs) ;;
-        *) die "invalid name (does not match *.btrfs): $fs" ;;
-    esac
-    shift
-    set -- "$@" "rootfs/${fs##*/}=$fs"
-done
-
-
 whole_device()
 {
     case "$1" in
@@ -133,6 +72,75 @@ generate_keys()
     fi
 }
 
+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
+}
+
+
+. samizdat-paths.sh || exit 1
+
+outdev=
+volid=SamizdatLive
+gpg_iso_path=gnupghome
+gnupghome=
+child_dir=$samizdat_child_dir/child.$$
+vmlinuz_dir=$samizdat_linux_dir
+efi_dir=$samizdat_grub_efi_dir
+
+die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
+
+TEMP="$(getopt -o '' --long bootloader,reuse-child:,adam,usb,detach,in:,out:,test -n "$0" -- "$@")" ||
+    die 'getopt error'
+eval set -- "$TEMP"
+
+ADAM=; DETACH=; USB=y
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --adam)   shift; ADAM=y;;
+        --bootloader) shift; BOOTLOADER_ONLY=y;;
+        --cdrom)    shift; USB=;;
+        --detach) shift; DETACH=y;;
+        --test)   shift; QUICK_TEST=y;;
+        --out)    CMDLINE_OUTDEV="$2"; USB=; shift 2;;
+        --in)     INPUT_DEVICE="$2"; shift 2;;
+        --reuse-child) REUSE_CHILD=y; child_dir=$samizdat_child_dir/child."$2"; shift 2;;
+        --)       shift; break;;
+        *) die 'getopt error';;
+    esac
+done
+
+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
+        set -- debian-live-8.4.0-amd64-standard.btrfs layer.btrfs
+    elif [ -e /srv/nbd.btrfs ]; then
+        set -- /srv/nbd.btrfs
+    elif [ "$(blockdev --getsz /dev/nbd0)" -gt 0 ]; then
+        (set -x; dd if=/dev/nbd0 of=/srv/nbd.btrfs~ && mv /srv/nbd.btrfs~ /srv/nbd.btrfs) || die "failed to copy network block device"
+        set -- /srv/nbd.btrfs
+    else
+        die "no input device and no input btrfs layers: aborting."
+    fi
+fi
+
+for fs; do
+    [ -f "$fs" ] || die "not a file: $fs"
+    case "$fs" in
+        *.btrfs) ;;
+        *) die "invalid name (does not match *.btrfs): $fs" ;;
+    esac
+    shift
+    set -- "$@" "rootfs/${fs##*/}=$fs"
+done
+
 
 [ "$(id -u)" = 0 ] || die "you are not root."
 
@@ -147,14 +155,6 @@ else
     generate_keys
 fi
 
-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
     if [ "$INPUT_DEVICE" = /dev/md55 ]; then
         if mountpoint -q /cdrom; then