summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjandob2016-03-22 15:43:43 +0100
committerjandob2016-03-22 15:43:43 +0100
commit9d294a2a1bd703883bbc37f4bfb32021fdc4a30a (patch)
treeae38b73fd94f604a9156018d33dec4a1d1e9d505
parentfix (diff)
downloadsystemd-init-9d294a2a1bd703883bbc37f4bfb32021fdc4a30a.tar.gz
systemd-init-9d294a2a1bd703883bbc37f4bfb32021fdc4a30a.tar.xz
systemd-init-9d294a2a1bd703883bbc37f4bfb32021fdc4a30a.zip
fix
-rwxr-xr-xbuilder/dnbd3-rootfs/scripts/container-unpack-xmount.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
index 4d6b4777..1cddd7e1 100755
--- a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
+++ b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
@@ -15,15 +15,14 @@ mkdir --parents /mnt/xmount
loop_device="$(losetup --find)"
if ! utils.dependency_check xmount; then
logging.warn "\"xmount\" not found, assuming raw image."
- losetup "$loop_device" "$in_device" --partscan
elif systemd-preserve-process-marker xmount --in qemu "$in_device" --out raw \
/mnt/xmount
then
- losetup "$loop_device" /mnt/xmount/*.dd --partscan
+ in_device="/mn/xmount/*.dd"
else
logging.warn "\"xmount\" call failed, assuming raw image."
- losetup "$loop_device" "$in_device" --partscan
fi
+losetup "$loop_device" $in_device --partscan
udevadm settle
echo "$loop_device"