flatten hooks directory tree

1 files changed, 11 insertions, 11 deletions

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index c39119ea..2f00f906 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -102,9 +102,9 @@ install() {
         # TODO analyze qemu-nbd pivot-root bug!
         inst_script "$moddir/services/dnbd3-generator.sh" \
             $systemdutildir/system-generators/dnbd3-generator
-        inst "$moddir/hooks/pre-mount/prepare-root-partition.sh" \
+        inst "$moddir/hooks/prepare-root-partition.sh" \
             /sbin/dnbd3root
-        inst "$moddir/hooks/pre-mount/fetch-config.sh" \
+        inst "$moddir/hooks/fetch-config.sh" \
             /sbin/fetch-config
         #region old approach
         #inst_simple "${moddir}/services/dnbd3root.service" \
@@ -122,10 +122,10 @@ install() {
     else
         # 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/pre-mount/fetch-config.sh"
+        inst_hook pre-mount 00 "$moddir/hooks/fetch-config.sh"
         # make the final blockdevice for the root system (dnbd3 -> qemu-nbd ->
         # device-mapper)
-        inst_hook pre-mount 10 "$moddir/hooks/pre-mount/prepare-root-partition.sh"
+        inst_hook pre-mount 10 "$moddir/hooks/prepare-root-partition.sh"
     fi
 
     # region binaries
@@ -140,17 +140,17 @@ install() {
 
     # region hooks
 
-    inst_hook cmdline 00 "$moddir/hooks/cmdline/enable-sysrq.sh"
-    inst_hook cmdline 10 "$moddir/hooks/cmdline/prepare-kernel-command-line-parameter.sh"
-    inst_hook cmdline 90 "$moddir/hooks/cmdline/set-dracut-environment-variables.sh"
+    inst_hook cmdline 00 "$moddir/hooks/enable-sysrq.sh"
+    inst_hook cmdline 10 "$moddir/hooks/prepare-kernel-command-line-parameter.sh"
+    inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh"
 
     # load nbd.ko, dnbd3.ko
-    inst_hook pre-udev 00 "$moddir/hooks/pre-udev/load-custom-kernel-modules.sh"
+    inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh"
 
-    inst_hook mount 10 "$moddir/hooks/mount/mount-root-device.sh"
+    inst_hook mount 10 "$moddir/hooks/mount-root-device.sh"
 
-    inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh"
-    #inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/mount-tmp.sh"
+    inst_hook pre-pivot 00 "$moddir/hooks/copy-openslx-configuration-into-newroot.sh"
+    #inst_hook pre-pivot 00 "$moddir/hooks/mount-tmp.sh"
 
     # endregion