diff options
| author | torben | 2016-03-22 12:52:29 +0100 |
|---|---|---|
| committer | torben | 2016-03-22 12:52:29 +0100 |
| commit | 8fd051c0ba521f9fc2200bd0bc97ad07b7aeb4c7 (patch) | |
| tree | 1fffba28f17a7e58fc7335cd1668eff3d388abc5 /builder | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
| download | systemd-init-8fd051c0ba521f9fc2200bd0bc97ad07b7aeb4c7.tar.gz systemd-init-8fd051c0ba521f9fc2200bd0bc97ad07b7aeb4c7.tar.xz systemd-init-8fd051c0ba521f9fc2200bd0bc97ad07b7aeb4c7.zip | |
Remove qemu-img dependency.
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/build-initramfs.sh | 1 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/prepare-root-partition.sh | 16 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index a20884dc..13be7b04 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -87,7 +87,6 @@ declare -A core_dependencies=( declare -A optional_dependencies=( [chroot]='build against a distribution other than this program runs in' \ ['curl git gzip tar']='dynamically retrieve and unpack missing application which will be compiled for current or given kernel' \ - [qemu-img]='support template systems in container (usually used by virtual runtime environments' \ ['mkfs.ext4 fsck']='support for persistent binary diffs in image files') # shellcheck disable=SC2034 declare -A core_shared_library_pattern_dependencies=( diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh index 5f4996cc..d051a250 100755 --- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh @@ -116,21 +116,7 @@ if [[ $return_code != 0 ]]; then fi # endregion # region scan partitions -read_only_device="" -if utils.dependency_check qemu-img && ! qemu-img info \ - "$SLX_DNBD3_DEVICE" | grep 'file format: raw' -then - read_only_device="$(container-unpack-xmount "$SLX_DNBD3_DEVICE")" -else - # Workaround to detect partitions on raw disks can be omitted when the - # dnbd3 kernel module supports it (like the nbd kernel module with - # parameter "max_part"). - loop_device="$(losetup --find)" - losetup "$loop_device" "$SLX_DNBD3_DEVICE" --partscan - read_only_device="$loop_device" - touch "$read_only_device" - udevadm settle -fi +read_only_device="$(container-unpack-xmount "$SLX_DNBD3_DEVICE")" # Fail fast if no device could be determined. [ -z "$read_only_device" ] && exit 1 # endregion diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index cecd9953..1a261def 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -256,7 +256,6 @@ install() { insmod \ losetup lsblk \ mktemp mount mountpoint \ - qemu-img \ sed sleep sort \ touch tr \ wget \ |