[dnbd3-rfs] refactor to use slx-partitioner

1 files changed, 6 insertions, 5 deletions

diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh
index 759cd476..f956af3c 100755
--- a/builder/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh
@@ -153,7 +153,7 @@ depends() {
     '
     local network_module="network"
     dracut_module_included "systemd-initrd" && network_module="systemd-networkd-ext"
-    echo base bash kernel-modules shutdown "$network_module"
+    echo base bash kernel-modules shutdown slx-partitioner "$network_module"
 }
 installkernel() {
     local __doc__='
@@ -166,7 +166,6 @@ installkernel() {
     '
     inst "$moddir/binaries/dnbd3/build/dnbd3.ko" \
         /usr/lib/modules/current/extra/dnbd3.ko
-    instmods dm_snapshot btrfs crc32c
 }
 install() {
     local __doc__='
@@ -185,6 +184,8 @@ install() {
         /usr/bin/device-add-write-layer
     inst "$moddir/scripts/container-unpack-xmount.sh" \
         /usr/bin/container-unpack-xmount
+    inst "$moddir/scripts/container-unpack-qemu.sh" \
+        /usr/bin/container-unpack-qemu
     # xmount
     local \
         xmount_installation="$moddir/binaries/xmount/trunk/build/release_build"
@@ -206,7 +207,7 @@ install() {
     inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
     # Get the openslx config from the servers configured in the kernel command
     # line (${SLX_SERVER}/${SLX_SERVER_BASE}/config).
-    inst_hook pre-mount 00 "$moddir/hooks/fetch-config.sh"
+    inst_hook pre-mount 10 "$moddir/hooks/fetch-config.sh"
     # make the final blockdevice for the root system (dnbd3 -> xmount ->
     # device-mapper)
     if dracut_module_included "systemd-initrd"; then
@@ -257,11 +258,11 @@ install() {
         basename bash blockdev \
         cat cut \
         dd diff dirname dmsetup \
-        find fsck.ext4 fsck.xfs \
+        find \
         grep \
         insmod \
         losetup lsblk \
-        mkfifo mkfs.ext4 mkfs.xfs mktemp mount mountpoint \
+        mkfifo mktemp mount mountpoint \
         sed sleep sort \
         tee touch tr \
         wget