fix everything

3 files changed, 25 insertions, 11 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index c02b8c6..5ec8688 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -10,7 +10,7 @@ PATH=/usr/local/bin:$PATH
 
 repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
-path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
+path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent'
 
 graft_paths="
     /bin/OpenVT=/bin/openvt
@@ -23,8 +23,6 @@ graft_paths="
 
 absolute_path_copies='/lib/terminfo/l/linux'
 
-samizdat_execs='wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent'
-for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 modules='loop xts dm-crypt hfs hfsplus'
 modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
 
diff --git a/src/qemu.sh b/src/qemu.sh
index 3b355b4..207ca68 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -24,11 +24,20 @@ initrd=${samizdat_isolinux_dir}/linux/initrd.img
 kernel=${samizdat_isolinux_dir}/linux/vmlinuz
 kcmdline='boot=samizdat components quiet splash'
 
+if [ "$QEMU_LOADS_LINUX" ]; then
+  set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline"
+fi
+
+if [ "$USE_ISO" ]; then
+  set -- -cdrom "$iso"
+else
+  set -- -boot n
+fi
+
 sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \
      -vga qxl \
      -net nic,vlan=0,model=virtio \
      -net "$NET" \
      -rtc base=localtime \
-     -cdrom "$iso" \
      -hda "$disk" \
-     -initrd "$initrd" -kernel "$kernel" -append "$kcmdline"
+     "$@"
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index ef26cb2..0d7773d 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -12,29 +12,35 @@ efi_dir=$samizdat_grub_efi_dir
 
 die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
 
-TEMP="$(getopt -o '' --long adam,usb,detach,in:,out:,test -n "$0" -- "$@")" ||
+TEMP="$(getopt -o '' --long bootloader,adam,usb,detach,in:,out:,test -n "$0" -- "$@")" ||
     die 'getopt error'
 eval set -- "$TEMP"
 
-ADAM=; DETACH=; USB=
+ADAM=; DETACH=; USB=y
 while [ $# -gt 0 ]; do
     case "$1" in
         --adam)   shift; ADAM=y;;
-        --usb)    shift; USB=y;;
+        --bootloader) shift; BOOTLOADER_ONLY=y;;
+        --cdrom)    shift; USB=;;
         --detach) shift; DETACH=y;;
         --test)   shift; QUICK_TEST=y;;
-        --out)    CMDLINE_OUTDEV="$2"; shift 2;;
+        --out)    CMDLINE_OUTDEV="$2"; USB=; shift 2;;
         --in)     INPUT_DEVICE="$2"; shift 2;;
         --)       shift; break;;
         *) die 'getopt error';;
     esac
 done
 
-if [ -z "$INPUT_DEVICE" -a $# = 0 ]; then
+if [ -z "$INPUT_DEVICE" -a $# = 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
@@ -113,7 +119,7 @@ choose_outdev()
 
 generate_keys()
 {
-    if [ "$ADAM" ]; then
+    if [ "$ADAM" -o "$BOOTLOADER_ONLY" ]; then
         kiki init || die 'kiki init failed'
         gnupghome=/root/.gnupg
     else
@@ -170,6 +176,7 @@ if [ "$REPLACE_INITRD" ]; then
     # support tftp pointing to the cdrom. This probably means a tftp directory
     # that contains a symlink to /cdrom/linux which gets updated on success here
     mv "${vmlinuz_dir}" "${vmlinuz_dir}".bak
+    mkdir "${vmlinuz_dir}"
     initrd.sh || {
         mv "${vmlinuz_dir}.bak" "${vmlinuz_dir}"
         die 'initrd.sh failed'