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/dnbd3-rootfs/scripts | |
| 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/dnbd3-rootfs/scripts')
| -rwxr-xr-x | builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh | 11 |
1 files changed, 8 insertions, 3 deletions
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" |