summaryrefslogtreecommitdiffstats
path: root/builder/dnbd3-rootfs/scripts
diff options
context:
space:
mode:
authorjandob2016-03-21 14:09:57 +0100
committerjandob2016-03-21 14:09:57 +0100
commitd6aba62f1fecffc19ebb55f354abadcb4fb24670 (patch)
tree41c9f67d8199926a0750a6a6c2efeeda7b682fee /builder/dnbd3-rootfs/scripts
parentadd Feature #834 (diff)
downloadsystemd-init-d6aba62f1fecffc19ebb55f354abadcb4fb24670.tar.gz
systemd-init-d6aba62f1fecffc19ebb55f354abadcb4fb24670.tar.xz
systemd-init-d6aba62f1fecffc19ebb55f354abadcb4fb24670.zip
add Feature #835
Diffstat (limited to 'builder/dnbd3-rootfs/scripts')
-rwxr-xr-xbuilder/dnbd3-rootfs/scripts/container-unpack-xmount.sh7
-rwxr-xr-xbuilder/dnbd3-rootfs/scripts/device-add-write-layer.sh1
2 files changed, 5 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
index 802c4e2f..49bb7418 100755
--- a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
+++ b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
@@ -7,10 +7,11 @@ exceptions.activate
# endregion
in_device="$1"
-mkdir /mnt
-systemd-preserve-process-marker xmount --in qemu $in_device --out raw /mnt
+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/*.dd --partscan
+losetup "$loop_device" /mnt/xmount/*.dd --partscan
udevadm settle
echo "$loop_device"
diff --git a/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh b/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh
index 4125ba45..2e4116a7 100755
--- a/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh
+++ b/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
# -*- coding: utf-8 -*-
# region imports
+# shellcheck source=./rebash/core.sh
source "/usr/lib/rebash/core.sh"
core.import exceptions
exceptions.activate