summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
m---------builder/dnbd3-rootfs/binaries/dnbd30
m---------builder/dnbd3-rootfs/binaries/qemu0
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh4
4 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index f8ea8421..69c3540b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@ builder/dracut
builder/dnbd3-rootfs/binaries/nbd/*
!builder/dnbd3-rootfs/binaries/nbd/Makefile
+builder/dnbd3-rootfs/binaries/qemu
+
builder/dnbd3-rootfs/binaries/dnbd3/*
builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/*
diff --git a/builder/dnbd3-rootfs/binaries/dnbd3 b/builder/dnbd3-rootfs/binaries/dnbd3
-Subproject 7e0668d1e4f78a0c7ff8689b197e2c104ce569e
+Subproject b47ba01818f2ea2ebd1cf1bf5e3e91e37c5f88d
diff --git a/builder/dnbd3-rootfs/binaries/qemu b/builder/dnbd3-rootfs/binaries/qemu
new file mode 160000
+Subproject 9df2513730c5902813f575a74ac9303388fd029
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 95e2989e..05bb8772 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -108,7 +108,7 @@ install() {
inst "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" \
/usr/bin/systemd-preserve-process-marker
# TODO: static linked qemu-nbd still needed?
- #inst "$moddir/binaries/qemu/qemu-nbd" /usr/bin/qemu-nbd
+ inst "$moddir/binaries/qemu/qemu-nbd" /usr/bin/qemu-nbd
# endregion
@@ -189,7 +189,7 @@ install() {
inst_multiple lsblk ping ip ifconfig sshd htop tail head vim touch sed \
lsmod sleep route wget find lsof strace chroot switch_root pivot_root \
mount fdisk mkfs.xfs env busybox ps agetty tree \
- insmod blockdev partx dmsetup sed cut awk tr insmod qemu-nbd \
+ insmod blockdev partx dmsetup sed cut awk tr insmod \ #qemu-nbd \
blockdev partx dmsetup cat cut awk losetup dd mkfs.ext4 grep \
basename dirname sort mktemp diff qemu-img
# Production: