From af8b87910eaf9ff7f3ad957d8aa9734e266e5eed Mon Sep 17 00:00:00 2001
From: jandob
Date: Tue, 22 Mar 2016 14:42:27 +0100
Subject: gget rid of qemu-img

---
 builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'builder/dnbd3-rootfs/scripts')

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"
 
-- 
cgit v1.2.3-55-g7522