restructure repo

* remove packager
* move everything from builder/* back to root

100 files changed, 5 insertions, 740 deletions

diff --git a/.gitmodules b/.gitmodules
index 67bd1aab..ab765198 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,20 @@
 [submodule "dnbd3"]
-	path = builder/modules.d/dnbd3-rootfs/binaries/dnbd3
+	path = modules.d/dnbd3-rootfs/binaries/dnbd3
 	url = git://git.openslx.org/dnbd3-ng.git
 	branch = master
 [submodule "xmount"]
-	path = builder/modules.d/dnbd3-rootfs/binaries/xmount
+	path = modules.d/dnbd3-rootfs/binaries/xmount
 	url = https://github.com/eaas-framework/xmount.git
 	branch = master
 [submodule "qemu-xmount"]
-	path = builder/modules.d/dnbd3-rootfs/binaries/qemu-xmount
+	path = modules.d/dnbd3-rootfs/binaries/qemu-xmount
 	url = https://github.com/eaas-framework/qemu
 	branch = libxmount_input
 [submodule "kernel-qcow2-util-linux"]
-	path = builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-util-linux
+	path = modules.d/dnbd3-rootfs/binaries/kernel-qcow2-util-linux
 	url = git://git.openslx.org/openslx/kernel-qcow2-util-linux.git
 	branch = kernel-qcow2
 [submodule "kernel-qcow2-linux"]
-	path = builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux
+	path = modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux
 	url = git://git.openslx.org/openslx/kernel-qcow2-linux.git
 	branch=kernel-qcow2-linux-4.18.x-centos
diff --git a/builder/build-initramfs.sh b/build-initramfs.sh
index d1a8017f..d1a8017f 100755
--- a/builder/build-initramfs.sh
+++ b/build-initramfs.sh
diff --git a/builder/modules.d/bootnet-conf/module-setup.sh b/modules.d/bootnet-conf/module-setup.sh
index f1d6697f..f1d6697f 100755
--- a/builder/modules.d/bootnet-conf/module-setup.sh
+++ b/modules.d/bootnet-conf/module-setup.sh
diff --git a/builder/modules.d/bootnet-conf/scripts/gen-bootnet-conf.sh b/modules.d/bootnet-conf/scripts/gen-bootnet-conf.sh
index ec82f143..ec82f143 100755
--- a/builder/modules.d/bootnet-conf/scripts/gen-bootnet-conf.sh
+++ b/modules.d/bootnet-conf/scripts/gen-bootnet-conf.sh
diff --git a/builder/modules.d/busybox/install-busybox-stage4.sh b/modules.d/busybox/install-busybox-stage4.sh
index ad34b75c..ad34b75c 100644
--- a/builder/modules.d/busybox/install-busybox-stage4.sh
+++ b/modules.d/busybox/install-busybox-stage4.sh
diff --git a/builder/modules.d/busybox/install-busybox.sh b/modules.d/busybox/install-busybox.sh
index 6848a735..6848a735 100644
--- a/builder/modules.d/busybox/install-busybox.sh
+++ b/modules.d/busybox/install-busybox.sh
diff --git a/builder/modules.d/busybox/module-setup.sh b/modules.d/busybox/module-setup.sh
index 807022e9..807022e9 100644
--- a/builder/modules.d/busybox/module-setup.sh
+++ b/modules.d/busybox/module-setup.sh
diff --git a/builder/modules.d/busybox/openslx.config b/modules.d/busybox/openslx.config
index 177f2fde..177f2fde 100644
--- a/builder/modules.d/busybox/openslx.config
+++ b/modules.d/busybox/openslx.config
diff --git a/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh b/modules.d/conf-tgz/hooks/fetch-config-tgz.sh
index 1c8ace61..1c8ace61 100755
--- a/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh
+++ b/modules.d/conf-tgz/hooks/fetch-config-tgz.sh
diff --git a/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh b/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
index a0da0cd3..a0da0cd3 100755
--- a/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
+++ b/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
diff --git a/builder/modules.d/conf-tgz/module-setup.sh b/modules.d/conf-tgz/module-setup.sh
index a07539cb..a07539cb 100755
--- a/builder/modules.d/conf-tgz/module-setup.sh
+++ b/modules.d/conf-tgz/module-setup.sh
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/dnbd3 b/modules.d/dnbd3-rootfs/binaries/dnbd3
-Subproject a6ddfe1212a2df72cacb0f44cc872b1bd0363c3
+Subproject a6ddfe1212a2df72cacb0f44cc872b1bd0363c3
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux b/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-linux
-Subproject 0761b3e9e03ed63b4adfd8b4a82f334352729a4
+Subproject 0761b3e9e03ed63b4adfd8b4a82f334352729a4
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-util-linux b/modules.d/dnbd3-rootfs/binaries/kernel-qcow2-util-linux
-Subproject 0692b963aa3cb846d8abab5ef5247c4dbb3fec9
+Subproject 0692b963aa3cb846d8abab5ef5247c4dbb3fec9
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/qemu-xmount b/modules.d/dnbd3-rootfs/binaries/qemu-xmount
-Subproject 4873cd023da8511ed9792a318d1456c94904612
+Subproject 4873cd023da8511ed9792a318d1456c94904612
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile b/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile
index 406ec50f..406ec50f 100644
--- a/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile
+++ b/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c b/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
index 8f0fc108..8f0fc108 100644
--- a/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
+++ b/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
diff --git a/builder/modules.d/dnbd3-rootfs/binaries/xmount b/modules.d/dnbd3-rootfs/binaries/xmount
-Subproject 015137556fce1e21273f198ae0b9158157f74f7
+Subproject 015137556fce1e21273f198ae0b9158157f74f7
diff --git a/builder/modules.d/dnbd3-rootfs/configuration/bash b/modules.d/dnbd3-rootfs/configuration/bash
index adefda40..adefda40 100755
--- a/builder/modules.d/dnbd3-rootfs/configuration/bash
+++ b/modules.d/dnbd3-rootfs/configuration/bash
diff --git a/builder/modules.d/dnbd3-rootfs/helper/build.inc b/modules.d/dnbd3-rootfs/helper/build.inc
index b3f9561c..b3f9561c 100644
--- a/builder/modules.d/dnbd3-rootfs/helper/build.inc
+++ b/modules.d/dnbd3-rootfs/helper/build.inc
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh b/modules.d/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
index ddfe4992..ddfe4992 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
+++ b/modules.d/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh b/modules.d/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
index 5de1f2e9..5de1f2e9 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
+++ b/modules.d/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh b/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
index ff01474f..ff01474f 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
+++ b/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh b/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh
index 323ec45e..323ec45e 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh
+++ b/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh b/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
index a11332a7..a11332a7 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
+++ b/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
index b3d3eb75..b3d3eb75 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
+++ b/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh b/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh
index 6f31bbac..6f31bbac 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh b/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
index aa782184..aa782184 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh b/modules.d/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh
index ad80349b..ad80349b 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh
+++ b/modules.d/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/shutdown-umount.sh b/modules.d/dnbd3-rootfs/hooks/shutdown-umount.sh
index ab78733c..ab78733c 100644
--- a/builder/modules.d/dnbd3-rootfs/hooks/shutdown-umount.sh
+++ b/modules.d/dnbd3-rootfs/hooks/shutdown-umount.sh
diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/modules.d/dnbd3-rootfs/module-setup.sh
index 77543a54..77543a54 100755
--- a/builder/modules.d/dnbd3-rootfs/module-setup.sh
+++ b/modules.d/dnbd3-rootfs/module-setup.sh
diff --git a/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service b/modules.d/dnbd3-rootfs/services/dnbd3root.service
index df079576..df079576 100644
--- a/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service
+++ b/modules.d/dnbd3-rootfs/services/dnbd3root.service
diff --git a/builder/modules.d/dns/module-setup.sh b/modules.d/dns/module-setup.sh
index 3bad6548..3bad6548 100755
--- a/builder/modules.d/dns/module-setup.sh
+++ b/modules.d/dns/module-setup.sh
diff --git a/builder/modules.d/dns/scripts/gen-resolv-conf.sh b/modules.d/dns/scripts/gen-resolv-conf.sh
index 1601bb12..1601bb12 100755
--- a/builder/modules.d/dns/scripts/gen-resolv-conf.sh
+++ b/modules.d/dns/scripts/gen-resolv-conf.sh
diff --git a/builder/modules.d/haveged/module-setup.sh b/modules.d/haveged/module-setup.sh
index d3183dbe..d3183dbe 100644
--- a/builder/modules.d/haveged/module-setup.sh
+++ b/modules.d/haveged/module-setup.sh
diff --git a/builder/modules.d/ib-conf/module-setup.sh b/modules.d/ib-conf/module-setup.sh
index 0a80d89e..0a80d89e 100755
--- a/builder/modules.d/ib-conf/module-setup.sh
+++ b/modules.d/ib-conf/module-setup.sh
diff --git a/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh b/modules.d/ib-conf/scripts/gen-ib-conf.sh
index 430dc887..430dc887 100755
--- a/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh
+++ b/modules.d/ib-conf/scripts/gen-ib-conf.sh
diff --git a/builder/modules.d/kexec-reboot/module-setup.sh b/modules.d/kexec-reboot/module-setup.sh
index 1cda92a0..1cda92a0 100755
--- a/builder/modules.d/kexec-reboot/module-setup.sh
+++ b/modules.d/kexec-reboot/module-setup.sh
diff --git a/builder/modules.d/kexec-reboot/scripts/kexec-reboot.sh b/modules.d/kexec-reboot/scripts/kexec-reboot.sh
index 68fa73b9..68fa73b9 100755
--- a/builder/modules.d/kexec-reboot/scripts/kexec-reboot.sh
+++ b/modules.d/kexec-reboot/scripts/kexec-reboot.sh
diff --git a/builder/modules.d/slx-addons/module-setup.sh b/modules.d/slx-addons/module-setup.sh
index 296b3fe4..296b3fe4 100755
--- a/builder/modules.d/slx-addons/module-setup.sh
+++ b/modules.d/slx-addons/module-setup.sh
diff --git a/builder/modules.d/slx-addons/scripts/setup-addons.sh b/modules.d/slx-addons/scripts/setup-addons.sh
index 94c2c444..94c2c444 100644
--- a/builder/modules.d/slx-addons/scripts/setup-addons.sh
+++ b/modules.d/slx-addons/scripts/setup-addons.sh
diff --git a/builder/modules.d/slx-clock/module-setup.sh b/modules.d/slx-clock/module-setup.sh
index 0c21b032..0c21b032 100755
--- a/builder/modules.d/slx-clock/module-setup.sh
+++ b/modules.d/slx-clock/module-setup.sh
diff --git a/builder/modules.d/slx-clock/scripts/ntp-sync.sh b/modules.d/slx-clock/scripts/ntp-sync.sh
index 887d5b13..887d5b13 100755
--- a/builder/modules.d/slx-clock/scripts/ntp-sync.sh
+++ b/modules.d/slx-clock/scripts/ntp-sync.sh
diff --git a/builder/modules.d/slx-dmsetup/module-setup.sh b/modules.d/slx-dmsetup/module-setup.sh
index 68e9b7b4..68e9b7b4 100755
--- a/builder/modules.d/slx-dmsetup/module-setup.sh
+++ b/modules.d/slx-dmsetup/module-setup.sh
diff --git a/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device b/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
index 1756865e..1756865e 100755
--- a/builder/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
+++ b/modules.d/slx-dmsetup/scripts/dmsetup-slx-device
diff --git a/builder/modules.d/slx-dmsetup/scripts/gen-fstab-persistent b/modules.d/slx-dmsetup/scripts/gen-fstab-persistent
index ed00b5de..ed00b5de 100644
--- a/builder/modules.d/slx-dmsetup/scripts/gen-fstab-persistent
+++ b/modules.d/slx-dmsetup/scripts/gen-fstab-persistent
diff --git a/builder/modules.d/slx-dmsetup/scripts/generate-fstab-persistent.sh b/modules.d/slx-dmsetup/scripts/generate-fstab-persistent.sh
index 5c6f2b82..5c6f2b82 100644
--- a/builder/modules.d/slx-dmsetup/scripts/generate-fstab-persistent.sh
+++ b/modules.d/slx-dmsetup/scripts/generate-fstab-persistent.sh
diff --git a/builder/modules.d/slx-dmsetup/scripts/generate-fstab-swap.sh b/modules.d/slx-dmsetup/scripts/generate-fstab-swap.sh
index bb37d6cf..bb37d6cf 100644
--- a/builder/modules.d/slx-dmsetup/scripts/generate-fstab-swap.sh
+++ b/modules.d/slx-dmsetup/scripts/generate-fstab-swap.sh
diff --git a/builder/modules.d/slx-dmsetup/scripts/get-partitions-by-id b/modules.d/slx-dmsetup/scripts/get-partitions-by-id
index 2fe5ce7a..2fe5ce7a 100755
--- a/builder/modules.d/slx-dmsetup/scripts/get-partitions-by-id
+++ b/modules.d/slx-dmsetup/scripts/get-partitions-by-id
diff --git a/builder/modules.d/slx-dmsetup/scripts/grow-rootfs.sh b/modules.d/slx-dmsetup/scripts/grow-rootfs.sh
index e2603835..e2603835 100644
--- a/builder/modules.d/slx-dmsetup/scripts/grow-rootfs.sh
+++ b/modules.d/slx-dmsetup/scripts/grow-rootfs.sh
diff --git a/builder/modules.d/slx-drm/hooks/activate-nvidia-drivers.sh b/modules.d/slx-drm/hooks/activate-nvidia-drivers.sh
index 5c9310e8..5c9310e8 100644
--- a/builder/modules.d/slx-drm/hooks/activate-nvidia-drivers.sh
+++ b/modules.d/slx-drm/hooks/activate-nvidia-drivers.sh
diff --git a/builder/modules.d/slx-drm/hooks/copy-nvidia-drivers.sh b/modules.d/slx-drm/hooks/copy-nvidia-drivers.sh
index 323af6d2..323af6d2 100644
--- a/builder/modules.d/slx-drm/hooks/copy-nvidia-drivers.sh
+++ b/modules.d/slx-drm/hooks/copy-nvidia-drivers.sh
diff --git a/builder/modules.d/slx-drm/module-setup.sh b/modules.d/slx-drm/module-setup.sh
index 4baa5b2a..4baa5b2a 100755
--- a/builder/modules.d/slx-drm/module-setup.sh
+++ b/modules.d/slx-drm/module-setup.sh
diff --git a/builder/modules.d/slx-network/TODO b/modules.d/slx-network/TODO
index bd119512..bd119512 100644
--- a/builder/modules.d/slx-network/TODO
+++ b/modules.d/slx-network/TODO
diff --git a/builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh b/modules.d/slx-network/hooks/activate-bootif-dhcp.sh
index f5345c61..f5345c61 100644
--- a/builder/modules.d/slx-network/hooks/activate-bootif-dhcp.sh
+++ b/modules.d/slx-network/hooks/activate-bootif-dhcp.sh
diff --git a/builder/modules.d/slx-network/hooks/copy-network-files.sh b/modules.d/slx-network/hooks/copy-network-files.sh
index d1dd48d1..d1dd48d1 100644
--- a/builder/modules.d/slx-network/hooks/copy-network-files.sh
+++ b/modules.d/slx-network/hooks/copy-network-files.sh
diff --git a/builder/modules.d/slx-network/hooks/parse-ipxe-network-kcl.sh b/modules.d/slx-network/hooks/parse-ipxe-network-kcl.sh
index 56abb680..56abb680 100644
--- a/builder/modules.d/slx-network/hooks/parse-ipxe-network-kcl.sh
+++ b/modules.d/slx-network/hooks/parse-ipxe-network-kcl.sh
diff --git a/builder/modules.d/slx-network/module-setup.sh b/modules.d/slx-network/module-setup.sh
index df95bfee..df95bfee 100755
--- a/builder/modules.d/slx-network/module-setup.sh
+++ b/modules.d/slx-network/module-setup.sh
diff --git a/builder/modules.d/slx-network/rdns.c b/modules.d/slx-network/rdns.c
index 218f7400..218f7400 100644
--- a/builder/modules.d/slx-network/rdns.c
+++ b/modules.d/slx-network/rdns.c
diff --git a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3 b/modules.d/slx-network/scripts/setup-bootif-network.stage3
index 53ad8de9..53ad8de9 100755
--- a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage3
+++ b/modules.d/slx-network/scripts/setup-bootif-network.stage3
diff --git a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage4 b/modules.d/slx-network/scripts/setup-bootif-network.stage4
index 61f925d0..61f925d0 100755
--- a/builder/modules.d/slx-network/scripts/setup-bootif-network.stage4
+++ b/modules.d/slx-network/scripts/setup-bootif-network.stage4
diff --git a/builder/modules.d/slx-network/scripts/udhcpc-trigger.stage3 b/modules.d/slx-network/scripts/udhcpc-trigger.stage3
index d54939a8..d54939a8 100755
--- a/builder/modules.d/slx-network/scripts/udhcpc-trigger.stage3
+++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage3
diff --git a/builder/modules.d/slx-network/scripts/udhcpc-trigger.stage4 b/modules.d/slx-network/scripts/udhcpc-trigger.stage4
index b4dfeafa..b4dfeafa 100755
--- a/builder/modules.d/slx-network/scripts/udhcpc-trigger.stage4
+++ b/modules.d/slx-network/scripts/udhcpc-trigger.stage4
diff --git a/builder/modules.d/slx-network/services/udhcpc-bootif.service b/modules.d/slx-network/services/udhcpc-bootif.service
index 21a5de3c..21a5de3c 100644
--- a/builder/modules.d/slx-network/services/udhcpc-bootif.service
+++ b/modules.d/slx-network/services/udhcpc-bootif.service
diff --git a/builder/modules.d/slx-runmode/module-setup.sh b/modules.d/slx-runmode/module-setup.sh
index 7705ad06..7705ad06 100755
--- a/builder/modules.d/slx-runmode/module-setup.sh
+++ b/modules.d/slx-runmode/module-setup.sh
diff --git a/builder/modules.d/slx-runmode/scripts/runmode.sh b/modules.d/slx-runmode/scripts/runmode.sh
index a563486f..a563486f 100644
--- a/builder/modules.d/slx-runmode/scripts/runmode.sh
+++ b/modules.d/slx-runmode/scripts/runmode.sh
diff --git a/builder/modules.d/slx-splash/data/splash.ppm.gz b/modules.d/slx-splash/data/splash.ppm.gz
index d30d44e2..d30d44e2 100644
--- a/builder/modules.d/slx-splash/data/splash.ppm.gz
+++ b/modules.d/slx-splash/data/splash.ppm.gz
diff --git a/builder/modules.d/slx-splash/module-setup.sh b/modules.d/slx-splash/module-setup.sh
index 05542269..05542269 100755
--- a/builder/modules.d/slx-splash/module-setup.sh
+++ b/modules.d/slx-splash/module-setup.sh
diff --git a/builder/modules.d/slx-splash/scripts/restore-cursor.sh b/modules.d/slx-splash/scripts/restore-cursor.sh
index 4ba9880d..4ba9880d 100644
--- a/builder/modules.d/slx-splash/scripts/restore-cursor.sh
+++ b/modules.d/slx-splash/scripts/restore-cursor.sh
diff --git a/builder/modules.d/slx-splash/scripts/slx-splash.sh b/modules.d/slx-splash/scripts/slx-splash.sh
index 7381997b..7381997b 100644
--- a/builder/modules.d/slx-splash/scripts/slx-splash.sh
+++ b/modules.d/slx-splash/scripts/slx-splash.sh
diff --git a/builder/modules.d/slx-tools/module-setup.sh b/modules.d/slx-tools/module-setup.sh
index faf2a04f..faf2a04f 100644
--- a/builder/modules.d/slx-tools/module-setup.sh
+++ b/modules.d/slx-tools/module-setup.sh
diff --git a/builder/modules.d/slx-tpm/module-setup.sh b/modules.d/slx-tpm/module-setup.sh
index f9a239e0..f9a239e0 100755
--- a/builder/modules.d/slx-tpm/module-setup.sh
+++ b/modules.d/slx-tpm/module-setup.sh
diff --git a/builder/modules.d/slx-uuid/bad-uuid-defaults.conf b/modules.d/slx-uuid/bad-uuid-defaults.conf
index aaf59a7d..aaf59a7d 100644
--- a/builder/modules.d/slx-uuid/bad-uuid-defaults.conf
+++ b/modules.d/slx-uuid/bad-uuid-defaults.conf
diff --git a/builder/modules.d/slx-uuid/module-setup.sh b/modules.d/slx-uuid/module-setup.sh
index 569b5155..569b5155 100755
--- a/builder/modules.d/slx-uuid/module-setup.sh
+++ b/modules.d/slx-uuid/module-setup.sh
diff --git a/builder/modules.d/slx-uuid/scripts/copy-system-uuid-to-newroot.sh b/modules.d/slx-uuid/scripts/copy-system-uuid-to-newroot.sh
index 553109fb..553109fb 100644
--- a/builder/modules.d/slx-uuid/scripts/copy-system-uuid-to-newroot.sh
+++ b/modules.d/slx-uuid/scripts/copy-system-uuid-to-newroot.sh
diff --git a/builder/modules.d/slx-uuid/scripts/get-system-uuid.sh b/modules.d/slx-uuid/scripts/get-system-uuid.sh
index fd6bb125..fd6bb125 100644
--- a/builder/modules.d/slx-uuid/scripts/get-system-uuid.sh
+++ b/modules.d/slx-uuid/scripts/get-system-uuid.sh
diff --git a/builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh b/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
index b9803729..b9803729 100644
--- a/builder/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
+++ b/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
diff --git a/builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh b/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh
index ec61616c..ec61616c 100644
--- a/builder/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh
+++ b/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh
diff --git a/builder/modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh b/modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh
index a64e6efe..a64e6efe 100644
--- a/builder/modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh
+++ b/modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh
diff --git a/builder/modules.d/systemd-networkd-ext/module-setup.sh b/modules.d/systemd-networkd-ext/module-setup.sh
index be50973d..be50973d 100755
--- a/builder/modules.d/systemd-networkd-ext/module-setup.sh
+++ b/modules.d/systemd-networkd-ext/module-setup.sh
diff --git a/packager/.gitignore b/packager/.gitignore
deleted file mode 100644
index f4ed9bc4..00000000
--- a/packager/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-clones
diff --git a/packager/blacklists/README b/packager/blacklists/README
deleted file mode 100644
index ed3fe459..00000000
--- a/packager/blacklists/README
+++ /dev/null
@@ -1,15 +0,0 @@
-This directory contains blacklists of files and directories that
-should be excluded when cloning stage4 of a remote system. The
-blacklists are split into groups, represented by sub-directories.
-They contain one or more text files representing blacklists in rsync
-"--exclude-from" format.
-
-There is a group called "essential", containg blacklists for essential
-files and dirs that you always want to exclude from being cloned.
-Other directories are create for specific software packages, like
-gnome, or kde.
-
-For inclusion of desktop environments like Gnome or KDE a substructure
-(subdirectory) called desktop-sessions was introduced. The files /
-directories in there should describe only includes ("+ ....") to provide
-files needed for a desktop environment.
diff --git a/packager/blacklists/essential/fontcache b/packager/blacklists/essential/fontcache
deleted file mode 100644
index 13d60d44..00000000
--- a/packager/blacklists/essential/fontcache
+++ /dev/null
@@ -1,3 +0,0 @@
-+ /var/cache/fontconfig
-+ /var/cache/fontconfig/*
-
diff --git a/packager/blacklists/essential/linux-base b/packager/blacklists/essential/linux-base
deleted file mode 100644
index 2c3ec439..00000000
--- a/packager/blacklists/essential/linux-base
+++ /dev/null
@@ -1,81 +0,0 @@
-- /cdrom/*
-- /dev/*
-- /adm/*
-- /afs/*
-- /bfg/*
-- /clustersw/*
-- /cvmfs/*
-- /gridsw/*
-- /storage/*
-
-# This is where the bind-mount of mltk resides...
-- /export/*
-- /etc/*ppp*
-- /etc/*pptp*
-- /etc/dhcp*
-- /etc/exports*
-- /etc/fstab
-#- /etc/group
-- /etc/group-
-- /etc/gshadow
-- /etc/gshadow-
-- /etc/hostname
-- /etc/hosts
-#- /etc/inputrc
-- /etc/issue.net
-# Always include ldconfig/cache of full system:
-+ /etc/ld.so.**
-#- /etc/localtime
-#- /etc/login.defs
-#- /etc/mtab
-#- /etc/mtab.*
-+ /etc/sysconfig/network-scripts/ifcfg-lo
-- /etc/sysconfig/network-scripts/ifcfg-*
-- /etc/networks
-#- /etc/passwd
-- /etc/passwd-
-#- /etc/resolv.conf
-#- /etc/resolvconf/
-#- /etc/shadow
-- /etc/shadow-
-#- /lib/modules/
-- /lost+found/
-- /media/*
-- /mnt/*
-- /opt/openslx
-- /proc/*
-- /run/*
-#- /srv/
-- /sys/*
-- /tmp/*
-#- /usr/src/
-+ /var/backup/**/
-- /var/backup/**
-+ /var/cache/**/
-- /var/cache/**
-+ /var/crash/**/
-- /var/crash/**
-+ /var/empty/**/
-- /var/empty/**
-+ /var/lock/**/
-- /var/lock/**
-+ /var/log/**/
-- /var/log/**
-+ /var/mail/**/
-- /var/mail/**
-#+ /var/spool/**/
-#- /var/spool/**
-+ /var/spool/torque/*
-- /var/tmp/*
-+ /var/tmp/*guestfs*
-- /var/lib/nova/instances/*
-- /var/lib/libvirt
-
-
-
-## Interfering binaries/links
-#- /sbin/shutdown
-#- /sbin/reboot
-#- /sbin/poweroff
-#- /sbin/halt
-##- /bin/sh
diff --git a/packager/blacklists/essential/linux-extended b/packager/blacklists/essential/linux-extended
deleted file mode 100644
index 90dcdca7..00000000
--- a/packager/blacklists/essential/linux-extended
+++ /dev/null
@@ -1,5 +0,0 @@
-- /home/*
-- /root/*
-#+ /root/.bash*
-#+ /root/.ssh
-- /etc/cups
diff --git a/packager/blacklists/essential/other-files b/packager/blacklists/essential/other-files
deleted file mode 100644
index d35a5736..00000000
--- a/packager/blacklists/essential/other-files
+++ /dev/null
@@ -1,3 +0,0 @@
-- .svn
-- .git
-- *.gvfs
diff --git a/packager/blacklists/essential/policykit b/packager/blacklists/essential/policykit
deleted file mode 100644
index 2f42c0e0..00000000
--- a/packager/blacklists/essential/policykit
+++ /dev/null
@@ -1,2 +0,0 @@
-#- /usr/share/pol*/actions/org.freedesktop.upower.*
-
diff --git a/packager/blacklists/essential/temp-files b/packager/blacklists/essential/temp-files
deleted file mode 100644
index 50955d08..00000000
--- a/packager/blacklists/essential/temp-files
+++ /dev/null
@@ -1,5 +0,0 @@
-- *~
-- *.bak
-- *.old
-- *.pid
-- *.tmp
diff --git a/packager/blacklists/essential/tm-scripts b/packager/blacklists/essential/tm-scripts
deleted file mode 100644
index 393effea..00000000
--- a/packager/blacklists/essential/tm-scripts
+++ /dev/null
@@ -1 +0,0 @@
-- **/tm-scripts
diff --git a/packager/blacklists/package-managers/apt b/packager/blacklists/package-managers/apt
deleted file mode 100644
index 5e019138..00000000
--- a/packager/blacklists/package-managers/apt
+++ /dev/null
@@ -1,2 +0,0 @@
-+ /var/cache/apt/archives/partial/**
-
diff --git a/packager/blacklists/package-managers/rpm b/packager/blacklists/package-managers/rpm
deleted file mode 100644
index 0527ee75..00000000
--- a/packager/blacklists/package-managers/rpm
+++ /dev/null
@@ -1,5 +0,0 @@
-- *.rpmnew
-- *.rpmsave
-- /etc/*rpmnew
-- /etc/*rpmorig
-- /etc/*rpmsave
diff --git a/packager/blacklists/package-managers/yast b/packager/blacklists/package-managers/yast
deleted file mode 100644
index 9de1ec05..00000000
--- a/packager/blacklists/package-managers/yast
+++ /dev/null
@@ -1,5 +0,0 @@
-- /var/lib/YaST2/you/mnt/*
-- /var/lib/YaST2/backup_boot_sectors
-- /etc/*YaST2save
-- *.YaST2save
-
diff --git a/packager/blacklists/package-managers/yum b/packager/blacklists/package-managers/yum
deleted file mode 100644
index 8b137891..00000000
--- a/packager/blacklists/package-managers/yum
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/packager/blacklists/package-managers/zypper b/packager/blacklists/package-managers/zypper
deleted file mode 100644
index fbab85d7..00000000
--- a/packager/blacklists/package-managers/zypper
+++ /dev/null
@@ -1,2 +0,0 @@
-- /var/lib/zypp
-
diff --git a/packager/openslx b/packager/openslx
deleted file mode 100755
index 6845f9ba..00000000
--- a/packager/openslx
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# ------------------------------------------------------------------------------
-#
-#                        OpenSLX Toolkit Next Gen
-#
-# ------------------------------------------------------------------------------
-#
-# The next generation toolkit to build a stateless linux system bootable
-# over the network. Composed of dracut-built initramfs and a full system clone.
-#
-# ------------------------------------------------------------------------------
-#
-#                                Main Code
-#
-# ------------------------------------------------------------------------------
-
-declare -rg ARG0="$0"
-declare -rg SELF="$(readlink -f "${ARG0}")"
-declare -rg ROOT_DIR="$(dirname "${SELF}")"
-declare -rg SELF_PID="$$"
-
-# let's keep it simple for now, just source our config/functions file
-. "${ROOT_DIR}/${ARG0}".functions || perror "Could not source functions."
-. "${ROOT_DIR}/${ARG0}".config || perror "Could not source config."
-
-# root check
-if [ "$(id -u)" -ne 0 ]; then
-	banner
-	perror "ERROR: You need to be root to use this toolkit."
-else
-	banner
-fi
-
-# setup trap
-trap do_cleanup SIGINT SIGTERM SIGUSR1 EXIT
-
-# read params
-read_params $@
-
-# react to given action
-process_action
-
-exit 0
diff --git a/packager/openslx.config b/packager/openslx.config
deleted file mode 100644
index 985ace1a..00000000
--- a/packager/openslx.config
+++ /dev/null
@@ -1,18 +0,0 @@
-# default options for rsync
-DEFAULT_RSYNC_OPTS="--acls \
-	--hard-links \
-	--xattrs \
-	--archive \
-	--delete \
-	--delete-excluded \
-	--numeric-ids \
-	--verbose"
-
-# default options used by rsync
-DEFAULT_RSYNC_RSH="ssh -c aes256-ctr -o StrictHostKeyChecking=no"
-
-# default size for the qcow2-container
-DEFAULT_CONTAINER_SIZE="20G"
-
-# default filesystem type for the qcow2-container
-DEFAULT_CONTAINER_FILESYSTEM="xfs"
diff --git a/packager/openslx.functions b/packager/openslx.functions
deleted file mode 100644
index fb32a231..00000000
--- a/packager/openslx.functions
+++ /dev/null
@@ -1,543 +0,0 @@
-# ------------------------------------------------------------------------------
-#
-#                          Functions for OpenSLX-NG
-#
-# ------------------------------------------------------------------------------
-#
-# check if we have our environment variables to check
-# if we actually got sourced by the main script
-if [ -z "${SELF_PID}" -o  -z "${ROOT_DIR}" ]; then
-	# not using perror, since we probably don't have it.
-	echo "Neither SELF_PID nor ROOT_DIR is set. Was this included by OpenSLX-NG?"
-	exit 1
-fi
-
-# ------------------------------------------------------------------------------
-#
-#                          General helper functions
-#
-# ------------------------------------------------------------------------------
-banner () {
-	echo -e "\033[38;5;196m\t"'                                    .__          '
-	echo -e "\033[38;5;196m\t"'  ____ ______   ____   ____   _____|  | ___  ___ '
-	echo -e "\033[38;5;202m\t"' /  _ \\\\____ \\_/ __ \\ /    \\ /  ___/  | \\  \\/  / '
-	echo -e "\033[38;5;208m\t"'(  <_> )  |_> >  ___/|   |  \\\\___ \\|  |__>    <  '
-	echo -e "\033[38;5;214m\t"' \\____/|   __/ \\___  >___|  /____  >____/__/\\_ \\ '
-	echo -e "\033[38;5;220m\t"'       |__|        \\/     \\/     \\/           \\/ '
-	echo -e "\033[38;5;220m\t"
-	echo -e "\033[38;5;226m\t                     ** OpenSLX Project // 2015 **"
-	echo -e "\033[38;5;232m\t                        http://lab.openslx.org/"
-	echo -e "\033[00m"
-}
-
-pinfo() {
-	echo -e "\033[38;5;10m[info]\033[0m $@"
-}
-
-pwarning() {
-	echo -e "\033[38;5;11m[warning]\033[0m $@"
-}
-
-perror() {
-	echo -e "\033[38;5;9m[error]\033[0m $@"
-	kill "$SELF_PID"
-	exit 1
-}
-
-# accepts one argument to be printed as a warning before dumping the help
-print_usage() {
-	[ -n "$1" ] && pwarning "$1"
-	pinfo "USAGE:"
-	pinfo "$ARG0 <action> <actions_params>"
-	pinfo "\t\tActions: '--clone', '--package', '--export', 'update'"
-	pinfo ""
-	pinfo "CLONING:      rsync remote host to local directory"
-	pinfo "$ARG0 --clone --host <host> [--syncdir <path>]"
-	pinfo "\t\tIf not specified, --syncdir = './clones/<host>/stage4'"
-	pinfo ""
-	pinfo "PACKAGING:    pack local rsync directory as qcow2-container"
-	pinfo "$ARG0 --package --host <host> [--container <path>] [--syncdir <dir>]"
-	pinfo "\t\tIf <container> is not specified, --container = './clones/<host>/stage4.qcow2'"
-	pinfo "\t\tIf <syncdir> is not specified, --syncdir = './clones/<host>/stage4'"
-	pinfo ""
-	pinfo "EXPORTING:    rsync remote host to a new qcow2-container"
-	pinfo "$ARG0 --export --host <host> [--container <path>] [--syncdir <dir>]"
-	pinfo "\t\tIf <container> is not specified, --container = './clones/<host>/stage4.qcow2'"
-	pinfo ""
-	pinfo "UPDATING:     rsync remote host to an existing qcow2-container"
-	pinfo "$ARG0 --update --host <host> [--container <path>]"
-	pinfo "\t\tIf <container> is not specified, --container = './clones/<host>/stage4.qcow2'"
-	kill "$SELF_PID"
-	exit 1
-}
-
-# helper to parse the command line arguments and fill the environment
-# with the parameters given. Since the fallbacks for those variables
-# are only dependent on the selected action, we will also post-process
-# them to make sure they are set when leaving this function!
-read_params() {
-	# initialize global variables
-	declare -g FORCE=0
-	unset ACTION REMOTE_HOST CONTAINER_PATH RSYNC_TARGET
-
-	# handle rest of arguments
-	while [ "$#" -gt "0" ]; do
-		local PARAM="$1"
-		shift
-
-		# options to current target
-		if [[ "$PARAM" == --* ]]; then
-			case "$PARAM" in
-				--clone)
-					declare -rg ACTION="CLONE"
-					;;
-				--package)
-					declare -rg ACTION="PACKAGE"
-					;;
-				--export)
-					declare -rg ACTION="EXPORT"
-					;;
-				--update)
-					declare -rg ACTION="UPDATE"
-					;;
-				--host)
-					if [ -z "$1" ]; then 
-						print_usage "'--host' requires a host as parameter."
-					else
-						if [[ "$1" == --* ]]; then
-							local _msg="A host should not start with '--'."
-							_msg="$_msg Parameter for '--host' missing?"
-							perror $_msg 
-						fi
-						declare -rg REMOTE_HOST="$1"
-						shift
-					fi
-					continue
-					;;
-				--container)
-					if [ -z "$1" ]; then 
-						print_usage "'--container' requires a path as parameter."
-					else
-						if [[ "$1" == --* ]]; then
-							local _msg="A path should not start with '--'."
-							_msg="$_msg Parameter for '--container' missing?"
-							perror $_msg 
-						fi
-						declare -rg CONTAINER_PATH="$1"
-						shift
-					fi
-					continue
-					;;
-				--syncdir)
-					if [ -z "$1" ]; then
-						print_usage "'--syncdir' requires a path as parameter."
-					else
-						if [[ "$1" == --* ]]; then
-							local _msg="A path should not start with '--'."
-							_msg="$_msg Parameter for '--syncdir' missing?"
-							perror $_msg 
-						fi
-						declare -rg RSYNC_TARGET="$1"
-						shift
-					fi
-					continue
-					;;
-				--force)
-					declare -rg FORCE=1
-					;;
-				*)
-					print_usage "Unknown flag: $PARAM"
-					;;
-			esac
-			continue
-		fi
-	done
-	# done parsing the arguments, exit if no action given
-	[ -z "$ACTION" ] && \
-		print_usage "No action given"
-
-	# now check for existance of variables
-	# and use fallbacks when possible if they were not specified
-
-	# REMOTE_HOST valid? always needed!
-	[ -z "$REMOTE_HOST" ] && \
-		perror "REMOTE_HOST not set. Use '--host'."
-	check_host "$REMOTE_HOST" || \
-		perror "'$REMOTE_HOST' is neither an IP nor a known hostname."
-	# REMOTE_HOST valid - set build directory for the rest of the operations
-	declare -rg BUILD_DIR="${ROOT_DIR}/clones/${REMOTE_HOST}"
-	mkdir -p "${BUILD_DIR}" || perror "Could not create '${BUILD_DIR}'."
-
-	# RSYNC_TARGET needs special care
-	if [ -z "$RSYNC_TARGET" ]; then
-		# none given - use fallbacks
-		if [ "x$ACTION" == "xCLONE" ]; then
-			# use default path when cloning, no need for CONTAINER_MNT
-			pwarning "RSYNC_TARGET not set, using: '${BUILD_DIR}/stage4/'."
-			declare -rg RSYNC_TARGET="${BUILD_DIR}/stage4"
-		else
-			# we always want CONTAINER_MNT here
-			declare -rg CONTAINER_MNT="$(mktemp -d)"
-			[ -z "${CONTAINER_MNT}" ] && \
-				perror "Could not create temporary directory for mounting the container."
-			add_cleanup rmdir "${CONTAINER_MNT}"
-			# RSYNC_TARGET depends on the action at this point
-			if [ "x$ACTION" == "xPACKAGE" ]; then
-				# use default path when packaging
-				declare -rg RSYNC_TARGET="${BUILD_DIR}/stage4"
-			elif [ "x$ACTION" == "xUPDATE" -o "x$ACTION" == "xEXPORT" ]; then
-				# for action update/export, we want to sync to the mounted container
-				# so create a temporary directory for the mount point that we'll use later
-				declare -rg RSYNC_TARGET="${CONTAINER_MNT}"
-			fi
-		fi
-	fi
-
-	# CONTAINER_PATH valid?
-	if [ -z "$CONTAINER_PATH" ]; then
-		# use default path: ${BUILD_DIR}/stage4.qcow2
-		pwarning "CONTAINER_PATH not set. Using '${BUILD_DIR}/stage4.qcow2'."
-		declare -rg CONTAINER_PATH="${BUILD_DIR}/stage4.qcow2"
-	fi
-	# so from now on REMOTE_HOST, RSYNC_TARGET, CONTAINER_PATH are set (and read-only).
-}
-process_action() {
-	if [ "x$ACTION" == "xCLONE" ]; then
-		clone_host || perror "Cloning stage4 failed with: $?"
-	elif [ "x$ACTION" == "xPACKAGE" ]; then
-		pack_clone || perror "Packing as QCoW2 failed with: $?"
-	elif [ "x$ACTION" == "xEXPORT" ]; then
-		export_host || perror "Exporting failed with: $?"
-	elif [ "x$ACTION" == "xUPDATE" ]; then
-		update_container || perror "Updating failed with: $?"
-	else
-		print_usage "No action given."
-	fi
-	return 0
-}
-
-# wrapper to package a cloned stage4 as a qcow2 container
-#	- creates empty container at CONTAINER_PATH
-#	- mounts it to RSYNC_TARGET
-#	- copy RSYNC_TARGET
-pack_clone() {
-	create_container
-	mount_container
-	copy_to_container
-}
-# wrapper to update an existing container
-#	- mounts it to RSYNC_TARGET
-#	- clone host there
-update_container() {
-	mount_container
-	clone_host
-}
-# wrapper to export a host directly to a container
-#	- create en empty qcow2 container at CONTAINER_PATH
-#	- mount it to RSYNC_TARGET
-#	- clone host there
-export_host() {
-	create_container
-	mount_container
-	clone_host
-}
-# ------------------------------------------------------------------------------
-#
-#                          Stage4 related functions
-#
-# ------------------------------------------------------------------------------
-#
-# Helper to generate a stage4 export for a remote machine per rsync.
-# Usage:
-#			clone_host
-#
-# Note: this functions requires REMOTE_HOST and RSYNC_TARGET to be set.
-clone_host() {
-	# check if RSYNC_TARGET is valid
-	if [ -d "${RSYNC_TARGET}" ]; then
-		# does it have the '.stage4' flag? skip this check when exporting directly
-		[ "x$ACTION" != "xEXPORT" ] && [ ! -e "${RSYNC_TARGET}/.stage4" ] && \
-			perror "'${RSYNC_TARGET}' exists, but no '.stage4' flag found. Refusing to rsync there."
-			#touch $RSYNC_TARGET/.stage4 && exit 0
-	else
-		# not a directory, create it and set the .stage4 flag
-		mkdir -p "${RSYNC_TARGET}" || perror "Could not create '${RSYNC_TARGET}'."
-	fi
-
-	local EXCLUDE="$BUILD_DIR/exclude-stage4"
-	local INCLUDE="$BUILD_DIR/include-stage4"
-
-	pinfo "Building rsync include/exclude files for building stage4...."
-	echo "## Exclude file for stage4 of $REMOTE_HOST" > "$EXCLUDE"
-	echo "## Include file for stage4 of $REMOTE_HOST" > "$INCLUDE"
-	for FILE in $(find "${ROOT_DIR}"/blacklists/*/ -type f); do
-		echo "## From $FILE" >> "$EXCLUDE"
-		echo "## From $FILE" >> "$INCLUDE"
-		grep '^-' "$FILE" >> "$EXCLUDE"
-		grep '^+' "$FILE" >> "$INCLUDE"
-	done
-
-	# prepare rsync's general options
-	local RSYNC_OPTS="${DEFAULT_RSYNC_OPTS}"
-	[ -z "${RSYNC_OPTS}" ] && \
-		RSYNC_OPTS="
-			--acls \
-			--hard-links \
-			--xattrs \
-			--archive \
-			--delete \
-			--delete-excluded \
-			--numeric-ids
-		"
-	# prepare rsync's remote shell options
-	local RSYNC_RSH="$DEFAULT_RSYNC_RSH"
-	[ -z "${RSYNC_RSH}" ] && RSYNC_RSH="ssh -c blowfish -oStrictHostKeyChecking=no"
-	local RSYNC_SOURCE="root@$REMOTE_HOST:/"
-
-	# if something goes wrong during rsync, we need to recreate the .stage4 flag
-	add_cleanup touch ${RSYNC_TARGET}/.stage4
-	# run rsync with the exclude/include lists created earlier
-	cat "$INCLUDE" "$EXCLUDE" | \
-		rsync ${RSYNC_OPTS} \
-				--exclude-from=- \
-            --rsh "${RSYNC_RSH}" \
-				"${RSYNC_SOURCE}" \
-				"${RSYNC_TARGET}"
-
-	local -i rsync_ret=$?
-	if [ "x$rsync_ret" != "x0" ]; then
-		perror "rsync from '${RSYNC_SOURCE}' to '${RSYNC_TARGET}' failed."
-	fi
-	touch "${RSYNC_TARGET}/.stage4"
-	# make sure everything gets flushed
-	sync
-	pinfo "Cloning '${REMOTE_HOST}' to '${RSYNC_TARGET}' succeeded."
-}
-
-# Helper to create the empty container at CONTAINER_PATH
-create_container() {
-	# CONTAINER_PATH valid?
-	[ -d "${CONTAINER_PATH}" ] && perror "Path to container can not be a directory!"
-	if [ -f "${CONTAINER_PATH}" ]; then
-		if [ $FORCE -eq 0 ]; then
-			perror "Container file already exists. Use '--force' to overwrite it."
-		else
-			# force removal
-			rm -f "${CONTAINER_PATH}" || perror "Could not remove '${CONTAINER_PATH}'"
-			pinfo "Removed old '${CONTAINER_PATH}'."
-		fi
-	fi
-
-	# which size for the qcow2 container?
-	local CONTAINER_SIZE="${DEFAULT_CONTAINER_SIZE}"
-	[ -z "${CONTAINER_SIZE}" ] && CONTAINER_SIZE="20G"
-
-	# so far so good
-	pinfo "Creating qcow2-container '${CONTAINER_PATH}'"
-	qemu-img create -f qcow2 "${CONTAINER_PATH}" "${CONTAINER_SIZE}" || \
-		perror "qemu-img create failed with: $?"
-	# now expose it as a loop device
-	expose_container
-	# filesystem for the qcow2 container?
-	local CONTAINER_FILESYSTEM="${DEFAULT_CONTAINER_FILESYSTEM}"
-	[ -z "${CONTAINER_FILESYSTEM}" ] && CONTAINER_FILESYSTEM="xfs"
-	# check if we have that mkfs helper
-	which "mkfs.${CONTAINER_FILESYSTEM}" || \
-		perror "Could not find 'mkfs.${CONTAINER_FILESYSTEM}'. Install it and retry." 
-
-	pinfo "Creating '${CONTAINER_FILESYSTEM}' filesystem on '${CONTAINER_PATH}'..."
-	mkfs."${CONTAINER_FILESYSTEM}" "${LOOPED_NBD_DEV}" || perror "mkfs failed with: $?"
-	return 0
-}
-
-# Helper exposing the container as a loop device
-expose_container() {
-	[ -z "${CONTAINER_PATH}" ] && \
-		perror "Internal error - CONTAINER_PATH not set but should be! Check read_params()"
-	
-	# find usable nbd device
-	declare -rg NBD_DEV="$(find_free_nbd)"
-	[ -n "${NBD_DEV}" ] || perror "Could not find usable NBD device."
-	[ -b "${NBD_DEV}" ] || perror "'${NBD_DEV}' is not a block device!"
-	pinfo "Connecting '${CONTAINER_PATH}' to '${NBD_DEV}'"
-
-	qemu-nbd -c "${NBD_DEV}" "${CONTAINER_PATH}" || \
-		perror "qemu-nbd failed with: $?"
-	add_cleanup disconnect_nbd
-	# expose as a loop device
-	declare -rg LOOPED_NBD_DEV="$(losetup --find)"
-	losetup "${LOOPED_NBD_DEV}" "${NBD_DEV}" || \
-		perror "Loop device setup for '${NBD_DEV}' failed with: $?"
-	add_cleanup disconnect_loop
-	return 0
-}
-
-# Helper to mount CONTAINER_PATH to CONTAINER_MNT through expose_container
-mount_container() {
-	[ -z "${CONTAINER_MNT}" ] && \
-		perror "Internal error - CONTAINER_MNT not set but should be! Check read_params()"
-
-	# connect container to a loop device first, if it wasnt already done
-	[ -z "${LOOPED_NBD_DEV}" ] && expose_container
-	# lets be safe...
-	[ -z "${LOOPED_NBD_DEV}" ] && \
-		perror "Internal error - LOOPED_NBD_DEV not set but should be! Check expose_container()"
-	
-	# now we got everything, mount it
-	pinfo "Mounting '${LOOPED_NBD_DEV}' to '${CONTAINER_MNT}'..."
-	mount "${LOOPED_NBD_DEV}" "${CONTAINER_MNT}" \
-		|| perror "Mount failed with: $?"
-	add_cleanup umount_container
-	return 0
-}
-
-# helper to copy the content of RSYNC_TARGET to CONTAINER_MNT
-copy_to_container() {
-	[ -z "${RSYNC_TARGET}" ] && \
-		perror "Internal error - RSYNC_TARGET not set but should be!"
-	[ -z "${CONTAINER_MNT}" ] && \
-		perror "Internal error - CONTAINER_MNT not set but should be!"
-	# sanity checks
-	is_dir_empty "$RSYNC_TARGET" && \
-		perror "'$RSYNC_TARGET' appears to be empty. Did you clone?"
-	# check for '.stage4' flag in the directory, indicating we cloned there
-	if [ ! -e "${RSYNC_TARGET}/.stage4" ]; then
-		perror "No '.stage4' flag found in '${RSYNC_TARGET}'." \
-					"Was this cloned properly?"
-	fi
-	# copy files from the stage4 directory to the mounted qcow2-container
-	pinfo "Copying '${RSYNC_TARGET}' to '${CONTAINER_MNT}'..."
-	rsync -avAHX "${RSYNC_TARGET}"/ "${CONTAINER_MNT}"/ \
-		|| perror "Rsync failed with: $?"
-	#make sure everything is flushed
-	sync && return 0
-}
-
-
-###############################################################################
-#
-#
-#
-###############################################################################
-# helper to find an unused nbd device
-# Usage:
-#			find_free_nbd
-# Echoes the name of the free device to stdout, empty string otherwise.
-find_free_nbd() {
-	local nbd_size=0
-	for nbd_id in {0..15}; do
-		[ -b "/dev/nbd${nbd_id}" ] || continue
-		[ -r "/sys/block/nbd${nbd_id}/size" ] || continue
-		nbd_size=$(cat /sys/block/nbd${nbd_id}/size)
-		[ $nbd_size -eq 0 ] && echo "/dev/nbd${nbd_id}" && break
-	done
-	echo ""
-}
-
-# helper to validate an ip
-# Usage:
-#			valid_ip <ip>
-# Returns 0 if valid, 1 otherwise.
-valid_ip() {
-    local  ip=$1
-    local  stat=1
-
-    if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-        OIFS=$IFS
-        IFS='.'
-        ip=($ip)
-        IFS=$OIFS
-        [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \
-            && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]]
-        stat=$?
-    fi
-    return $stat
-}
-
-# helper to check whether a given host is valid
-# Usage:
-#			check_host <hostname|ip>
-# Returns 0 if valid, 1 otherwise
-check_host() {
-	local HOST="$1"
-	[ -z "$HOST" ] && return 1
-	# check if its a valid IP or a valid hostname
-	valid_ip "$HOST" && return 0
-	host -W 2 "$HOST" && return 0
-	# still here? then fail
-	return 1
-}
-
-# helper to check if a dir is empty or not
-# Usage:
-#			dir_empty <dir>
-# Returns 0 if empty, 1 otherwise
-is_dir_empty() {
-	[ $# -ne 1 ] && perror "$0 requires directory as paramter, none given."
-	local _dir="$1"
-	[ -d "$_dir" ] || return 1
-	[ -n "$(ls -A $_dir)" ] && return 1 || return 0
-}
-
-# helper to ask user for confirmation
-# Usage:
-#			user_confirm
-# Return 0 if confirmed, 1 otherwise
-user_confirm() {
-	[ $# -ne 1 ] && perror "$0 requires the question as first argument."
-	pinfo "$1 [Y/n]"
-	local _input
-	read _input
-	[ "x${_input}" == "x" -o "x${_input}" == "xy" ] && return 0 || return 1
-}
-
-###############################################################################
-#
-# CLEANUP FUNCTIONS
-#
-###############################################################################
-# indexed array for cleanup commands
-declare -ag cleanup_commands
-
-# function to add a cleanup command to be executed when the program exits
-add_cleanup() {
-	# get current command count
-	local -i count="${#cleanup_commands[*]}"
-	cleanup_commands[$count]="$*"
-}
-
-# function trapped to EXIT, SIGINT, SIGTERM
-# do the cleanup in FILO style
-do_cleanup() {
-	trap '' SIGINT SIGTERM EXIT	# from now on, ignore INT and TERM
-	for i in $(seq $(( ${#cleanup_commands[*]} - 1 )) -1 0); do
-		eval ${cleanup_commands[$i]}
-	done
-}
-
-# Helper to umount + disconnect the container from all the devices
-umount_container() {
-	[ -z "${CONTAINER_MNT}" ] && \
-		perror "CONTAINER_MNT not set - is it really mounted?"
-	# sync?
-	umount -l "${CONTAINER_MNT}" || \
-		perror "Failed to umount '${CONTAINER_MNT}'."
-#	rmdir "${CONTAINER_MNT}" || \
-#		pwarning "Could not remove '${CONTAINER_MNT}'."
-}
-
-# Helper to disconnect from loop device
-disconnect_loop() {
-	[ -z "${LOOPED_NBD_DEV}" ] && \
-		perror "Container not connected to a loop device?"
-	losetup -d "${LOOPED_NBD_DEV}" ||\
-		perror "Could not disconnect loop device '${LOOPED_NBD_DEV}'."
-}
-# Helper to disconnect from nbd device
-disconnect_nbd() {
-	[ -z "${NBD_DEV}" ] && \
-		perror "Container does not seem to be connected to a NBD device?"
-	qemu-nbd -d "${NBD_DEV}" || \
-		perror "Could not disconnect '${CONTAINER_PATH}' from '${NBD_DEV}'."
-}
-
diff --git a/builder/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch b/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch
index c85a8f55..c85a8f55 100644
--- a/builder/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch
+++ b/patches/qemu-xmount/01-fix_ld_pie_relocateable.patch
diff --git a/builder/patches/qemu-xmount/02-fix_memfd_mman.patch b/patches/qemu-xmount/02-fix_memfd_mman.patch
index 8b272085..8b272085 100644
--- a/builder/patches/qemu-xmount/02-fix_memfd_mman.patch
+++ b/patches/qemu-xmount/02-fix_memfd_mman.patch
diff --git a/builder/readme.md b/readme.md
index 113d30c2..113d30c2 100644
--- a/builder/readme.md
+++ b/readme.md