diff options
| author | jandob | 2016-03-22 14:42:27 +0100 |
|---|---|---|
| committer | jandob | 2016-03-22 14:42:27 +0100 |
| commit | af8b87910eaf9ff7f3ad957d8aa9734e266e5eed (patch) | |
| tree | 3b23754c178175b4f4682ef7954f00b484c6bb27 /builder | |
| parent | add traceback to hook errors that lead to an emergency shell (diff) | |
| download | systemd-init-af8b87910eaf9ff7f3ad957d8aa9734e266e5eed.tar.gz systemd-init-af8b87910eaf9ff7f3ad957d8aa9734e266e5eed.tar.xz systemd-init-af8b87910eaf9ff7f3ad957d8aa9734e266e5eed.zip | |
gget rid of qemu-img
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/prepare-root-partition.sh | 9 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh index 8aee2b6b..3dc22978 100755 --- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -15,12 +15,13 @@ logging.set_level debug source /etc/openslx # region find writable partition -if ! persistent_device=$(tools.find_block_device \ - "$SLX_WRITABLE_DEVICE_IDENTIFIER") +if [[ "$SLX_WRITABLE_DEVICE_IDENTIFIER" != "" ]] \ + && ! persistent_device=$( + tools.find_block_device "$SLX_WRITABLE_DEVICE_IDENTIFIER") then logging.warn "Failed to find unique device with identifier" \ - "'${SLX_WRITABLE_DEVICE_IDENTIFIER}'; matched devices:" \ - "'${persistent_device}'" + "\"${SLX_WRITABLE_DEVICE_IDENTIFIER}\"; matched devices:" \ + "\"${persistent_device}\"" fi # TODO move somewhere else diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh index 49bb7418..05dd7940 100755 --- a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh +++ b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh @@ -8,10 +8,15 @@ exceptions.activate in_device="$1" mkdir --parents /mnt/xmount -systemd-preserve-process-marker xmount --in qemu "$in_device" --out raw \ - /mnt/xmount loop_device="$(losetup --find)" -losetup "$loop_device" /mnt/xmount/*.dd --partscan +if systemd-preserve-process-marker xmount --in qemu "$in_device" --out raw \ + /mnt/xmount +then + losetup "$loop_device" /mnt/xmount/*.dd --partscan +else + # assume raw disk image + losetup "$loop_device" "$in_device"--partscan +fi udevadm settle echo "$loop_device" |