diff options
| author | jandob | 2016-03-22 14:50:41 +0100 |
|---|---|---|
| committer | jandob | 2016-03-22 14:50:41 +0100 |
| commit | 88217180a00196d40c4c111c5437751d6e19de7a (patch) | |
| tree | e7a9f8ed9c8362cce294365fafa26bc86ac736b5 | |
| parent | gget rid of qemu-img (diff) | |
| download | systemd-init-88217180a00196d40c4c111c5437751d6e19de7a.tar.gz systemd-init-88217180a00196d40c4c111c5437751d6e19de7a.tar.xz systemd-init-88217180a00196d40c4c111c5437751d6e19de7a.zip | |
fix
| -rwxr-xr-x | builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh index 05dd7940..d40e8dad 100755 --- a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh +++ b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh @@ -2,19 +2,26 @@ # -*- coding: utf-8 -*- # region imports source '/usr/lib/rebash/core.sh' +core.import logging +core.import utils core.import exceptions exceptions.activate # endregion +logging.set_level info +logging.set_commands_level info in_device="$1" mkdir --parents /mnt/xmount loop_device="$(losetup --find)" -if systemd-preserve-process-marker xmount --in qemu "$in_device" --out raw \ +if ! utils.dependecy_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 else - # assume raw disk image + logging.warn "\"xmount\" call failed, assuming raw image." losetup "$loop_device" "$in_device"--partscan fi udevadm settle |