diff options
-rwxr-xr-x | builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh | 7 | ||||
-rwxr-xr-x | builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh | 10 | ||||
-rwxr-xr-x | builder/dnbd3-rootfs/scripts/device-add-write-layer.sh | 6 | ||||
-rwxr-xr-x | dev-tools/prepare-persistent-disks (renamed from builder/dnbd3-rootfs/scripts/prepare-persistent-disks) | 0 |
4 files changed, 4 insertions, 19 deletions
diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh b/builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh index ea3f2620..2592bfe9 100755 --- a/builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh +++ b/builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh @@ -1,13 +1,10 @@ #!/usr/bin/env bash - -# region imports +# -*- coding: utf-8 -*- source "/usr/lib/rebash/core.sh" core.import exceptions exceptions.activate -# endregion - in_device="$1" nbd_device="$2" # TODO detect first free nbd device @@ -32,8 +29,6 @@ echo change > /sys/block/nbd0/uevent udevadm settle # region vim modline - # vim: set tabstop=4 shiftwidth=4 expandtab: # vim: foldmethod=marker foldmarker=region,endregion: - # endregion diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh index a5658e25..b5a3e999 100755 --- a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh +++ b/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh @@ -1,25 +1,19 @@ #!/usr/bin/env bash - -# region imports +# -*- coding: utf-8 -*- source "/usr/lib/rebash/core.sh" core.import exceptions exceptions.activate -# endregion - in_device="$1" - mkdir /mnt systemd-preserve-process-marker xmount --in qemu $in_device --out raw /mnt -loop_device="$(losetup -f)" +loop_device="$(losetup --find)" losetup "$loop_device" /mnt/*.dd --partscan udevadm settle echo "$loop_device" # region vim modline - # vim: set tabstop=4 shiftwidth=4 expandtab: # vim: foldmethod=marker foldmarker=region,endregion: - # endregion diff --git a/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh b/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh index 67c14314..c7cd2f6c 100755 --- a/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh +++ b/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh @@ -1,12 +1,10 @@ #!/usr/bin/env bash - -# region imports +# -*- coding: utf-8 -*- source "/usr/lib/rebash/core.sh" core.import exceptions exceptions.activate -# endregion combined_device_name="$1" read_only_device="$2" writable_device="$3" @@ -21,8 +19,6 @@ dmsetup create "$combined_device_name" --noudevsync --table \ dmsetup mknodes --noudevsync "$combined_device_name" # region vim modline - # vim: set tabstop=4 shiftwidth=4 expandtab: # vim: foldmethod=marker foldmarker=region,endregion: - # endregion diff --git a/builder/dnbd3-rootfs/scripts/prepare-persistent-disks b/dev-tools/prepare-persistent-disks index 2e68dd9e..2e68dd9e 100755 --- a/builder/dnbd3-rootfs/scripts/prepare-persistent-disks +++ b/dev-tools/prepare-persistent-disks |