moved all dracut modules to modules.d/ + support

97 files changed, 43 insertions, 29 deletions

diff --git a/.gitmodules b/.gitmodules
index a012df3d..7f42791f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,16 @@
 [submodule "rebash"]
-	path = builder/dnbd3-rootfs/scripts/rebash
+	path = builder/modules.d/dnbd3-rootfs/scripts/rebash
 	url = git://github.com/jandob/rebash.git
 	branch = master
 [submodule "dnbd3"]
-	path = builder/dnbd3-rootfs/binaries/dnbd3
+	path = builder/modules.d/dnbd3-rootfs/binaries/dnbd3
 	url = git://git.openslx.org/dnbd3.git
 	branch = master
 [submodule "xmount"]
-	path = builder/dnbd3-rootfs/binaries/xmount
+	path = builder/modules.d/dnbd3-rootfs/binaries/xmount
 	url = https://github.com/eaas-framework/xmount.git
 	branch = master
 [submodule "qemu-xmount"]
-	path = builder/dnbd3-rootfs/binaries/qemu-xmount
+	path = builder/modules.d/dnbd3-rootfs/binaries/qemu-xmount
 	url = https://github.com/eaas-framework/qemu
 	branch = libxmount_input
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index dcab3b1d..0c01c888 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -24,9 +24,9 @@
 
 ## region ensure presence of needed dependencies
 set -o errexit
-_needed_location="$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs"
+_needed_location="$(dirname "${BASH_SOURCE[0]}")/modules.d"
 if ! [[ -d "$_needed_location" ]]; then
-    echo "The dnbd3 dracut plugin isn't available, loading it."
+    echo "The dracut modules aren't available, loading them."
     if ! hash git; then
         echo "Needed dependency \"git\" isn't available. Please install \"git\" or provide the repositories data structure in \"$(dirname "${BASH_SOURCE[0]}")\"."
     fi
@@ -41,19 +41,29 @@ if ! [[ -d "$_needed_location" ]]; then
         branch="$(git config --file "$toplevel/.gitmodules" "submodule.$name.branch")"
         git clone --depth 1 --branch "$branch"
     '
-    git submodule update --remote
+    git submodule update # --remote <- this seems like a bad idea
     popd
-    for mod in dnbd3-rootfs conf-tgz dns ib-conf bootnet-conf; do
-        cp --recursive \
-            "${_temporary_repository_location}/builder/${mod}" \
-            "$(dirname $_needed_location)/${mod}"
-    done
+    # finally copy all dracut modules under modules.d/
+    _nullglob_backup="$(shopt -p nullglob || true)"
+    shopt -u nullglob
+    ## HACK the directory structure until its git'ed
+    #_temporary_modules_directory="$(mktemp --directory)"
+    #cp --recursive \
+    #    "${_temporary_repository_location}/builder/"*/ \
+    #    "${_temporary_modules_directory}/"
+    ## re-set old nullglob option
+    #${_nullglob_backup}
+    #mv "${_temporary_modules_directory}" "${_temporary_repository_location}/builder/modules.d/"
+    # END HACK
+    cp --recursive \
+        "${_temporary_repository_location}/builder/modules.d/" \
+        "$(dirname $_needed_location)"
     rm --recursive --force "$_temporary_repository_location"
 fi
 set +o errexit
 ## endregion
 # shellcheck source=./dnbd3-rootfs/scripts/rebash/core.sh
-source "$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs/scripts/rebash/core.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/modules.d/dnbd3-rootfs/scripts/rebash/core.sh"
 core.import exceptions
 core.import logging
 core.import utils
@@ -435,7 +445,7 @@ cleanup() {
     `cleanup`
     '
     local plugin_path
-    plugin_path="$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs/"
+    plugin_path="$(dirname "${BASH_SOURCE[0]}")/modules.d/dnbd3-rootfs/"
     # shellcheck disable=SC1090
     source "${plugin_path}module-setup.sh"
     # shellcheck disable=SC2034
@@ -552,23 +562,26 @@ main() {
         logging.info "Dracut isn't available yet loading it."
         initialize_dracut
     fi
-    
-    declare -A _dracut_modules=( [dnbd3]='../../dnbd3-rootfs' [conf]='../../conf-tgz' [dns]='../../dns' [ib]='../../ib-conf' [bootnet]='../../bootnet-conf')
-    for mod in dnbd3 conf dns ib bootnet; do
-        _dracut_modules_source="${_dracut_modules[$mod]}"
-        _dracut_modules_target="$(dirname "${BASH_SOURCE[0]}")/dracut/modules.d/90$(basename "${_dracut_modules[$mod]}")"
-        if [[ ! -L "$_dracut_modules_target" || "$(readlink \
-            "$_dracut_modules_target")" != "$_dracut_modules_source" ]]
+
+    for _dracut_module in "$(dirname "${BASH_SOURCE[0]}")/modules.d/"*; do
+        [ -d "${_dracut_module}" ] || continue
+        _dracut_module="$(basename $_dracut_module)"
+        # shouldn't we use absolute paths here?
+        _dracut_module_relative_path="../../modules.d/${_dracut_module}"
+        _dracut_module_target="$(dirname "${BASH_SOURCE[0]}")/dracut/modules.d/90${_dracut_module}"
+        if [[ ! -L "$_dracut_module_target" || "$(readlink \
+            "$_dracut_module_target")" != "$_dracut_module_relative_path" ]]
         then
             logging.info \
-                "Link ${mod} plugin into dracut modules folder ($_dracut_modules_source -> $_dracut_modules_target)."
-            if ! ln --symbolic --force "$_dracut_modules_source" \
-            "$_dracut_modules_target" 2>/dev/null; then
+                "Link ${_dracut_module} plugin into dracut modules folder ($_dracut_module_relative_path -> $_dracut_module_target)."
+            if ! ln --symbolic --force "$_dracut_module_relative_path" \
+            "$_dracut_module_target"; then
                 logging.warn \
-                    "Linking \"$_dracut_modules_source\" to \"$_dracut_modules_target\" failed. We will copy them. So we have to recopy it every time to ensure that recompiled things take effect."
+                    "Linking \"$_dracut_module_relative_path\" to \"$_dracut_module_target\" failed." \
+                    " We will copy them. So we have to recopy it every time to ensure that recompiled things take effect."
                 cp --recursive --force --no-target-directory \
-                    "$(dirname "${BASH_SOURCE[0]}")/$(basename "$_dracut_modules_source")" \
-                    "$_dracut_modules_target"
+                    "$(dirname "${BASH_SOURCE[0]}")/modules.d/$_dracut_module" \
+                    "$_dracut_module_target"
             fi
         fi
     done
@@ -578,7 +591,8 @@ main() {
     if [ "$verbose" == 'yes' ]; then
         _loglevel='--verbose'
     fi
-    _modules='dnbd3-rootfs conf-tgz dns ib-conf bootnet-conf'
+    _modules='dnbd3-rootfs conf-tgz'
+    logging.info "Default modules: ${_modules}"
     if [ "$debug" == 'yes' ]; then
         _loglevel="$_loglevel --stdlog 4"
         _modules="$_modules i18n terminfo"
@@ -588,7 +602,7 @@ main() {
     fi
     if [[ "$full_cleanup" == 'yes' ]]; then
         logging.info 'Removing all modules.'
-        rm "$(dirname "${BASH_SOURCE[0]}")/dnbd3-rootfs" \
+        rm "$(dirname "${BASH_SOURCE[0]}")/modules.d" \
             "$(dirname "${BASH_SOURCE[0]}")/dracut" --recursive --force
     elif [[ "$cleanup" == 'yes' ]]; then
         logging.info 'Removing distribution specific files.'
diff --git a/builder/bootnet-conf/module-setup.sh b/builder/modules.d/bootnet-conf/module-setup.sh
index f1d6697f..f1d6697f 100755
--- a/builder/bootnet-conf/module-setup.sh
+++ b/builder/modules.d/bootnet-conf/module-setup.sh
diff --git a/builder/bootnet-conf/scripts/gen-bootnet-conf.sh b/builder/modules.d/bootnet-conf/scripts/gen-bootnet-conf.sh
index ec82f143..ec82f143 100755
--- a/builder/bootnet-conf/scripts/gen-bootnet-conf.sh
+++ b/builder/modules.d/bootnet-conf/scripts/gen-bootnet-conf.sh
diff --git a/builder/conf-tgz/hooks/fetch-config-tgz.sh b/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh
index 8c3bed23..8c3bed23 100755
--- a/builder/conf-tgz/hooks/fetch-config-tgz.sh
+++ b/builder/modules.d/conf-tgz/hooks/fetch-config-tgz.sh
diff --git a/builder/conf-tgz/hooks/unpack-config-tgz.sh b/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
index 083fbc6e..083fbc6e 100755
--- a/builder/conf-tgz/hooks/unpack-config-tgz.sh
+++ b/builder/modules.d/conf-tgz/hooks/unpack-config-tgz.sh
diff --git a/builder/conf-tgz/module-setup.sh b/builder/modules.d/conf-tgz/module-setup.sh
index 946344bf..946344bf 100755
--- a/builder/conf-tgz/module-setup.sh
+++ b/builder/modules.d/conf-tgz/module-setup.sh
diff --git a/builder/dnbd3-rootfs/binaries/dnbd3 b/builder/modules.d/dnbd3-rootfs/binaries/dnbd3
-Subproject 210b653ff4043a27992389e765a2c3a79938a54
+Subproject 210b653ff4043a27992389e765a2c3a79938a54
diff --git a/builder/dnbd3-rootfs/binaries/qemu-xmount b/builder/modules.d/dnbd3-rootfs/binaries/qemu-xmount
-Subproject 4873cd023da8511ed9792a318d1456c94904612
+Subproject 4873cd023da8511ed9792a318d1456c94904612
diff --git a/builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile b/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile
index 406ec50f..406ec50f 100644
--- a/builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile
+++ b/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/Makefile
diff --git a/builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c b/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
index 8f0fc108..8f0fc108 100644
--- a/builder/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
+++ b/builder/modules.d/dnbd3-rootfs/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker.c
diff --git a/builder/dnbd3-rootfs/binaries/xmount b/builder/modules.d/dnbd3-rootfs/binaries/xmount
-Subproject 015137556fce1e21273f198ae0b9158157f74f7
+Subproject 015137556fce1e21273f198ae0b9158157f74f7
diff --git a/builder/dnbd3-rootfs/configuration/bash b/builder/modules.d/dnbd3-rootfs/configuration/bash
index adefda40..adefda40 100755
--- a/builder/dnbd3-rootfs/configuration/bash
+++ b/builder/modules.d/dnbd3-rootfs/configuration/bash
diff --git a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh b/builder/modules.d/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
index ee308af6..ee308af6 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
diff --git a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh b/builder/modules.d/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
index a887d8c9..a887d8c9 100755
--- a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
diff --git a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh b/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
index 6a56f857..6a56f857 100755
--- a/builder/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/copy-openslx-configuration-into-newroot.sh
diff --git a/builder/dnbd3-rootfs/hooks/enable-sysrq.sh b/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh
index f159e3ae..f159e3ae 100755
--- a/builder/dnbd3-rootfs/hooks/enable-sysrq.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh
diff --git a/builder/dnbd3-rootfs/hooks/fetch-config.sh b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
index 23c5f004..23c5f004 100755
--- a/builder/dnbd3-rootfs/hooks/fetch-config.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh
diff --git a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
index fe153265..fe153265 100755
--- a/builder/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
diff --git a/builder/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh
index 35443def..35443def 100755
--- a/builder/dnbd3-rootfs/hooks/mount-root-device.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh
diff --git a/builder/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh b/builder/modules.d/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh
index 20041ecf..20041ecf 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/prepare-kernel-command-line-parameter.sh
diff --git a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
index 3e93253f..3e93253f 100755
--- a/builder/dnbd3-rootfs/hooks/prepare-root-partition.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/prepare-root-partition.sh
diff --git a/builder/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh b/builder/modules.d/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh
index ad80349b..ad80349b 100755
--- a/builder/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/set-dracut-environment-variables.sh
diff --git a/builder/dnbd3-rootfs/hooks/shutdown-umount.sh b/builder/modules.d/dnbd3-rootfs/hooks/shutdown-umount.sh
index 29b52187..29b52187 100644
--- a/builder/dnbd3-rootfs/hooks/shutdown-umount.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/shutdown-umount.sh
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh
index 549900ad..549900ad 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh
diff --git a/builder/dnbd3-rootfs/scripts/build.sh b/builder/modules.d/dnbd3-rootfs/scripts/build.sh
index 47e5dcc7..47e5dcc7 100644
--- a/builder/dnbd3-rootfs/scripts/build.sh
+++ b/builder/modules.d/dnbd3-rootfs/scripts/build.sh
diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh b/builder/modules.d/dnbd3-rootfs/scripts/container-unpack-qemu.sh
index 53fd73dc..53fd73dc 100755
--- a/builder/dnbd3-rootfs/scripts/container-unpack-qemu.sh
+++ b/builder/modules.d/dnbd3-rootfs/scripts/container-unpack-qemu.sh
diff --git a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh b/builder/modules.d/dnbd3-rootfs/scripts/container-unpack-xmount.sh
index c7e1b45c..c7e1b45c 100755
--- a/builder/dnbd3-rootfs/scripts/container-unpack-xmount.sh
+++ b/builder/modules.d/dnbd3-rootfs/scripts/container-unpack-xmount.sh
diff --git a/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh b/builder/modules.d/dnbd3-rootfs/scripts/device-add-write-layer.sh
index 2e4116a7..2e4116a7 100755
--- a/builder/dnbd3-rootfs/scripts/device-add-write-layer.sh
+++ b/builder/modules.d/dnbd3-rootfs/scripts/device-add-write-layer.sh
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/modules.d/dnbd3-rootfs/scripts/rebash
-Subproject 6ca5b39c862aed6a13146f4121fb51f784b1eb4
+Subproject 6ca5b39c862aed6a13146f4121fb51f784b1eb4
diff --git a/builder/dnbd3-rootfs/scripts/tools.sh b/builder/modules.d/dnbd3-rootfs/scripts/tools.sh
index bace775e..bace775e 100644
--- a/builder/dnbd3-rootfs/scripts/tools.sh
+++ b/builder/modules.d/dnbd3-rootfs/scripts/tools.sh
diff --git a/builder/dnbd3-rootfs/services/dnbd3root.service b/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service
index 592b049d..592b049d 100644
--- a/builder/dnbd3-rootfs/services/dnbd3root.service
+++ b/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service
diff --git a/builder/dnbd3-rootfs/udev/70-openslx-disk.rules b/builder/modules.d/dnbd3-rootfs/udev/70-openslx-disk.rules
index 9aad9a41..9aad9a41 100644
--- a/builder/dnbd3-rootfs/udev/70-openslx-disk.rules
+++ b/builder/modules.d/dnbd3-rootfs/udev/70-openslx-disk.rules
diff --git a/builder/dns/module-setup.sh b/builder/modules.d/dns/module-setup.sh
index 3bad6548..3bad6548 100755
--- a/builder/dns/module-setup.sh
+++ b/builder/modules.d/dns/module-setup.sh
diff --git a/builder/dns/scripts/gen-resolv-conf.sh b/builder/modules.d/dns/scripts/gen-resolv-conf.sh
index 1601bb12..1601bb12 100755
--- a/builder/dns/scripts/gen-resolv-conf.sh
+++ b/builder/modules.d/dns/scripts/gen-resolv-conf.sh
diff --git a/builder/ib-conf/module-setup.sh b/builder/modules.d/ib-conf/module-setup.sh
index 0a80d89e..0a80d89e 100755
--- a/builder/ib-conf/module-setup.sh
+++ b/builder/modules.d/ib-conf/module-setup.sh
diff --git a/builder/ib-conf/scripts/gen-ib-conf.sh b/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh
index 2d4b7a27..2d4b7a27 100755
--- a/builder/ib-conf/scripts/gen-ib-conf.sh
+++ b/builder/modules.d/ib-conf/scripts/gen-ib-conf.sh
diff --git a/builder/wlan-boot/README b/builder/modules.d/wlan-boot/README
index 71bc5ff5..71bc5ff5 100644
--- a/builder/wlan-boot/README
+++ b/builder/modules.d/wlan-boot/README
diff --git a/builder/wlan-boot/binaries/dhcpcd b/builder/modules.d/wlan-boot/binaries/dhcpcd
index 933e4cc7..933e4cc7 100755
--- a/builder/wlan-boot/binaries/dhcpcd
+++ b/builder/modules.d/wlan-boot/binaries/dhcpcd
diff --git a/builder/wlan-boot/binaries/systemd-preserve-process-marker b/builder/modules.d/wlan-boot/binaries/systemd-preserve-process-marker
index 99d1e0c4..99d1e0c4 100755
--- a/builder/wlan-boot/binaries/systemd-preserve-process-marker
+++ b/builder/modules.d/wlan-boot/binaries/systemd-preserve-process-marker
diff --git a/builder/wlan-boot/certs/Deutsche_Telekom_Root_CA_2.pem b/builder/modules.d/wlan-boot/certs/Deutsche_Telekom_Root_CA_2.pem
index 05879ff3..05879ff3 100644
--- a/builder/wlan-boot/certs/Deutsche_Telekom_Root_CA_2.pem
+++ b/builder/modules.d/wlan-boot/certs/Deutsche_Telekom_Root_CA_2.pem
diff --git a/builder/wlan-boot/chroot/README b/builder/modules.d/wlan-boot/chroot/README
index 8d6a5e50..8d6a5e50 100644
--- a/builder/wlan-boot/chroot/README
+++ b/builder/modules.d/wlan-boot/chroot/README
diff --git a/builder/wlan-boot/chroot/environment.tar b/builder/modules.d/wlan-boot/chroot/environment.tar
index 2838ecea..2838ecea 100644
--- a/builder/wlan-boot/chroot/environment.tar
+++ b/builder/modules.d/wlan-boot/chroot/environment.tar
diff --git a/builder/wlan-boot/chroot/environment/bin/sh b/builder/modules.d/wlan-boot/chroot/environment/bin/sh
index 5672e081..5672e081 100755
--- a/builder/wlan-boot/chroot/environment/bin/sh
+++ b/builder/modules.d/wlan-boot/chroot/environment/bin/sh
diff --git a/builder/wlan-boot/chroot/environment/etc/ssl/certs/Deutsche_Telekom_Root_CA_2.pem b/builder/modules.d/wlan-boot/chroot/environment/etc/ssl/certs/Deutsche_Telekom_Root_CA_2.pem
index 05879ff3..05879ff3 100644
--- a/builder/wlan-boot/chroot/environment/etc/ssl/certs/Deutsche_Telekom_Root_CA_2.pem
+++ b/builder/modules.d/wlan-boot/chroot/environment/etc/ssl/certs/Deutsche_Telekom_Root_CA_2.pem
diff --git a/builder/wlan-boot/chroot/environment/lib64/ld-linux-x86-64.so.2 b/builder/modules.d/wlan-boot/chroot/environment/lib64/ld-linux-x86-64.so.2
index b39bc468..b39bc468 100755
--- a/builder/wlan-boot/chroot/environment/lib64/ld-linux-x86-64.so.2
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/ld-linux-x86-64.so.2
diff --git a/builder/wlan-boot/chroot/environment/lib64/libc.so.6 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libc.so.6
index 58b51aa6..58b51aa6 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libc.so.6
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libc.so.6
diff --git a/builder/wlan-boot/chroot/environment/lib64/libcom_err.so.2 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libcom_err.so.2
index 5617634d..5617634d 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libcom_err.so.2
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libcom_err.so.2
diff --git a/builder/wlan-boot/chroot/environment/lib64/libcrypto.so.10 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libcrypto.so.10
index fcb9e36a..fcb9e36a 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libcrypto.so.10
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libcrypto.so.10
diff --git a/builder/wlan-boot/chroot/environment/lib64/libdbus-1.so.3 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libdbus-1.so.3
index b024940b..b024940b 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libdbus-1.so.3
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libdbus-1.so.3
diff --git a/builder/wlan-boot/chroot/environment/lib64/libdl.so.2 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libdl.so.2
index 3d6cddcb..3d6cddcb 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libdl.so.2
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libdl.so.2
diff --git a/builder/wlan-boot/chroot/environment/lib64/libgssapi_krb5.so.2 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libgssapi_krb5.so.2
index 3f5c6a07..3f5c6a07 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libgssapi_krb5.so.2
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libgssapi_krb5.so.2
diff --git a/builder/wlan-boot/chroot/environment/lib64/libk5crypto.so.3 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libk5crypto.so.3
index 18d24b6d..18d24b6d 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libk5crypto.so.3
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libk5crypto.so.3
diff --git a/builder/wlan-boot/chroot/environment/lib64/libkeyutils.so.1 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libkeyutils.so.1
index c9fdf185..c9fdf185 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libkeyutils.so.1
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libkeyutils.so.1
diff --git a/builder/wlan-boot/chroot/environment/lib64/libkrb5.so.3 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libkrb5.so.3
index 20c40016..20c40016 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libkrb5.so.3
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libkrb5.so.3
diff --git a/builder/wlan-boot/chroot/environment/lib64/libkrb5support.so.0 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libkrb5support.so.0
index 08d42cd7..08d42cd7 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libkrb5support.so.0
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libkrb5support.so.0
diff --git a/builder/wlan-boot/chroot/environment/lib64/liblzma.so.5 b/builder/modules.d/wlan-boot/chroot/environment/lib64/liblzma.so.5
index 3e2841a6..3e2841a6 100755
--- a/builder/wlan-boot/chroot/environment/lib64/liblzma.so.5
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/liblzma.so.5
diff --git a/builder/wlan-boot/chroot/environment/lib64/libm.so.6 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libm.so.6
index 9e471ce5..9e471ce5 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libm.so.6
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libm.so.6
diff --git a/builder/wlan-boot/chroot/environment/lib64/libnl-3.so.200 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libnl-3.so.200
index 03733566..03733566 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libnl-3.so.200
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libnl-3.so.200
diff --git a/builder/wlan-boot/chroot/environment/lib64/libnl-genl-3.so.200 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libnl-genl-3.so.200
index 2fbb7caa..2fbb7caa 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libnl-genl-3.so.200
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libnl-genl-3.so.200
diff --git a/builder/wlan-boot/chroot/environment/lib64/libpcre.so.1 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libpcre.so.1
index 4e100f6b..4e100f6b 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libpcre.so.1
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libpcre.so.1
diff --git a/builder/wlan-boot/chroot/environment/lib64/libpthread.so.0 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libpthread.so.0
index f3b670d7..f3b670d7 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libpthread.so.0
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libpthread.so.0
diff --git a/builder/wlan-boot/chroot/environment/lib64/libresolv.so.2 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libresolv.so.2
index 08ea9aed..08ea9aed 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libresolv.so.2
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libresolv.so.2
diff --git a/builder/wlan-boot/chroot/environment/lib64/librt.so.1 b/builder/modules.d/wlan-boot/chroot/environment/lib64/librt.so.1
index d19805a0..d19805a0 100755
--- a/builder/wlan-boot/chroot/environment/lib64/librt.so.1
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/librt.so.1
diff --git a/builder/wlan-boot/chroot/environment/lib64/libselinux.so.1 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libselinux.so.1
index 22335824..22335824 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libselinux.so.1
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libselinux.so.1
diff --git a/builder/wlan-boot/chroot/environment/lib64/libssl.so.10 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libssl.so.10
index 163d81b3..163d81b3 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libssl.so.10
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libssl.so.10
diff --git a/builder/wlan-boot/chroot/environment/lib64/libtinfo.so.5 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libtinfo.so.5
index 74001427..74001427 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libtinfo.so.5
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libtinfo.so.5
diff --git a/builder/wlan-boot/chroot/environment/lib64/libz.so.1 b/builder/modules.d/wlan-boot/chroot/environment/lib64/libz.so.1
index 257c46b1..257c46b1 100755
--- a/builder/wlan-boot/chroot/environment/lib64/libz.so.1
+++ b/builder/modules.d/wlan-boot/chroot/environment/lib64/libz.so.1
diff --git a/builder/wlan-boot/chroot/environment/libexec/dhcpcd-hooks/10-wpa_supplicant b/builder/modules.d/wlan-boot/chroot/environment/libexec/dhcpcd-hooks/10-wpa_supplicant
index adea9957..adea9957 100755
--- a/builder/wlan-boot/chroot/environment/libexec/dhcpcd-hooks/10-wpa_supplicant
+++ b/builder/modules.d/wlan-boot/chroot/environment/libexec/dhcpcd-hooks/10-wpa_supplicant
diff --git a/builder/wlan-boot/chroot/environment/libexec/dhcpcd-run-hooks b/builder/modules.d/wlan-boot/chroot/environment/libexec/dhcpcd-run-hooks
index 8caf0dc9..8caf0dc9 100755
--- a/builder/wlan-boot/chroot/environment/libexec/dhcpcd-run-hooks
+++ b/builder/modules.d/wlan-boot/chroot/environment/libexec/dhcpcd-run-hooks
diff --git a/builder/wlan-boot/chroot/environment/usr/bin/systemd-preserve-process-marker b/builder/modules.d/wlan-boot/chroot/environment/usr/bin/systemd-preserve-process-marker
index 99d1e0c4..99d1e0c4 100755
--- a/builder/wlan-boot/chroot/environment/usr/bin/systemd-preserve-process-marker
+++ b/builder/modules.d/wlan-boot/chroot/environment/usr/bin/systemd-preserve-process-marker
diff --git a/builder/wlan-boot/chroot/environment/usr/sbin/dhcpcd b/builder/modules.d/wlan-boot/chroot/environment/usr/sbin/dhcpcd
index 933e4cc7..933e4cc7 100755
--- a/builder/wlan-boot/chroot/environment/usr/sbin/dhcpcd
+++ b/builder/modules.d/wlan-boot/chroot/environment/usr/sbin/dhcpcd
diff --git a/builder/wlan-boot/chroot/environment/usr/sbin/wpa_supplicant b/builder/modules.d/wlan-boot/chroot/environment/usr/sbin/wpa_supplicant
index 39ddd72d..39ddd72d 100755
--- a/builder/wlan-boot/chroot/environment/usr/sbin/wpa_supplicant
+++ b/builder/modules.d/wlan-boot/chroot/environment/usr/sbin/wpa_supplicant
diff --git a/builder/wlan-boot/chroot/wpa_libs.lst b/builder/modules.d/wlan-boot/chroot/wpa_libs.lst
index ed5fa99e..ed5fa99e 100644
--- a/builder/wlan-boot/chroot/wpa_libs.lst
+++ b/builder/modules.d/wlan-boot/chroot/wpa_libs.lst
diff --git a/builder/wlan-boot/debug/binaries/busybox.tar b/builder/modules.d/wlan-boot/debug/binaries/busybox.tar
index b5ac4a64..b5ac4a64 100755
--- a/builder/wlan-boot/debug/binaries/busybox.tar
+++ b/builder/modules.d/wlan-boot/debug/binaries/busybox.tar
diff --git a/builder/wlan-boot/debug/hooks/install_busybox.sh b/builder/modules.d/wlan-boot/debug/hooks/install_busybox.sh
index 3b763f0e..3b763f0e 100755
--- a/builder/wlan-boot/debug/hooks/install_busybox.sh
+++ b/builder/modules.d/wlan-boot/debug/hooks/install_busybox.sh
diff --git a/builder/wlan-boot/debug/scripts/restart_wpa.sh b/builder/modules.d/wlan-boot/debug/scripts/restart_wpa.sh
index 3e284772..3e284772 100755
--- a/builder/wlan-boot/debug/scripts/restart_wpa.sh
+++ b/builder/modules.d/wlan-boot/debug/scripts/restart_wpa.sh
diff --git a/builder/wlan-boot/debug/services/debug-shell.service b/builder/modules.d/wlan-boot/debug/services/debug-shell.service
index 462694a6..462694a6 100644
--- a/builder/wlan-boot/debug/services/debug-shell.service
+++ b/builder/modules.d/wlan-boot/debug/services/debug-shell.service
diff --git a/builder/wlan-boot/hooks/parse-wlan-kernel-command-line-parameter.sh b/builder/modules.d/wlan-boot/hooks/parse-wlan-kernel-command-line-parameter.sh
index dbda284c..dbda284c 100755
--- a/builder/wlan-boot/hooks/parse-wlan-kernel-command-line-parameter.sh
+++ b/builder/modules.d/wlan-boot/hooks/parse-wlan-kernel-command-line-parameter.sh
diff --git a/builder/wlan-boot/hooks/prepare-newroot.sh b/builder/modules.d/wlan-boot/hooks/prepare-newroot.sh
index c58ea15c..c58ea15c 100755
--- a/builder/wlan-boot/hooks/prepare-newroot.sh
+++ b/builder/modules.d/wlan-boot/hooks/prepare-newroot.sh
diff --git a/builder/wlan-boot/hooks/start_wlan.sh b/builder/modules.d/wlan-boot/hooks/start_wlan.sh
index c39b9161..c39b9161 100755
--- a/builder/wlan-boot/hooks/start_wlan.sh
+++ b/builder/modules.d/wlan-boot/hooks/start_wlan.sh
diff --git a/builder/wlan-boot/module-setup.sh b/builder/modules.d/wlan-boot/module-setup.sh
index d944c1a9..d944c1a9 100755
--- a/builder/wlan-boot/module-setup.sh
+++ b/builder/modules.d/wlan-boot/module-setup.sh
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/01-test b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/01-test
index d4cf8281..d4cf8281 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/01-test
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/01-test
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/02-dump b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/02-dump
index 0d515f78..0d515f78 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/02-dump
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/02-dump
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/10-wpa_supplicant b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/10-wpa_supplicant
index adea9957..adea9957 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/10-wpa_supplicant
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/10-wpa_supplicant
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/15-timezone b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/15-timezone
index 0ccdc45b..0ccdc45b 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/15-timezone
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/15-timezone
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/20-resolv.conf b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/20-resolv.conf
index e4db368d..e4db368d 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/20-resolv.conf
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/20-resolv.conf
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/29-lookup-hostname b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/29-lookup-hostname
index 04ad275e..04ad275e 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/29-lookup-hostname
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/29-lookup-hostname
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/30-hostname b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/30-hostname
index eea6a5ce..eea6a5ce 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/30-hostname
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/30-hostname
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/50-dhcpcd-compat b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-dhcpcd-compat
index 0d6256e6..0d6256e6 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/50-dhcpcd-compat
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-dhcpcd-compat
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/50-ntp.conf b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-ntp.conf
index 74805039..74805039 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/50-ntp.conf
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-ntp.conf
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/50-yp.conf b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-yp.conf
index 2da68ebc..2da68ebc 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/50-yp.conf
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-yp.conf
diff --git a/builder/wlan-boot/scripts/dhcpcd-hooks/50-ypbind.in b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-ypbind.in
index a9ebbfa6..a9ebbfa6 100755
--- a/builder/wlan-boot/scripts/dhcpcd-hooks/50-ypbind.in
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-hooks/50-ypbind.in
diff --git a/builder/wlan-boot/scripts/dhcpcd-run-hooks b/builder/modules.d/wlan-boot/scripts/dhcpcd-run-hooks
index 8caf0dc9..8caf0dc9 100755
--- a/builder/wlan-boot/scripts/dhcpcd-run-hooks
+++ b/builder/modules.d/wlan-boot/scripts/dhcpcd-run-hooks
diff --git a/builder/wlan-boot/services/dhcp.service b/builder/modules.d/wlan-boot/services/dhcp.service
index 6f87ac53..6f87ac53 100644
--- a/builder/wlan-boot/services/dhcp.service
+++ b/builder/modules.d/wlan-boot/services/dhcp.service
diff --git a/builder/wlan-boot/services/wpa_supplicant.service b/builder/modules.d/wlan-boot/services/wpa_supplicant.service
index 350e19de..350e19de 100644
--- a/builder/wlan-boot/services/wpa_supplicant.service
+++ b/builder/modules.d/wlan-boot/services/wpa_supplicant.service
diff --git a/builder/wlan-boot/udev/80-net-wlan.rules b/builder/modules.d/wlan-boot/udev/80-net-wlan.rules
index c2c17b3b..c2c17b3b 100644
--- a/builder/wlan-boot/udev/80-net-wlan.rules
+++ b/builder/modules.d/wlan-boot/udev/80-net-wlan.rules