move all file removal cleanups to "cleanup" hook

diff --git a/dracut-functions b/dracut-functions
index 68bda06562eca99cc4483d9c74c8ca584589a03b..434ffa27102d54c4e2e48eae4fc89178f9f685e8 100755 (executable)
--- a/dracut-functions
+++ b/dracut-functions
@@ -592,7 +592,7 @@ inst() {
 
 [[ $hookdirs ]] || {
     hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount"
-    hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown"
+    hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown cleanup"
     export hookdirs
 }
 

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index 19968544d10c5db858c0abf9c0506a078afff873..62c1f1b304403345ab376010e41605d297ac69ed 100755 (executable)
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -87,7 +87,7 @@ install() {
         inst ${moddir}/console_init /lib/udev/console_init
         inst_rules ${moddir}/10-console.rules
         inst_hook cmdline 20 "${moddir}/parse-i18n.sh"
-        inst_hook pre-pivot 20 "${moddir}/i18n-cleanup.sh"
+        inst_hook cleanup 20 "${moddir}/i18n-cleanup.sh"
     }
 
     install_all_kbd() {

diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
index 5c9eaee1f6b687ac71425ab9676f060e6dab087c..475c21902d3a91a94cab8a27ae1188f568c6cc5f 100755 (executable)
--- a/modules.d/50plymouth/module-setup.sh
+++ b/modules.d/50plymouth/module-setup.sh
@@ -46,7 +46,7 @@ install() {
 
     inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
     inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
-    inst_hook pre-pivot 10 "$moddir"/plymouth-cleanup.sh
+    inst_hook cleanup 10 "$moddir"/plymouth-cleanup.sh
     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
     inst readlink
 }

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 74ae25f5efed996953c25fbaf08a7b1bba4d0cdf..88b6b60f7e5572dcc8c2abe363b9aec7b9bc2e86 100755 (executable)
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -75,7 +75,7 @@ install() {
         inst_simple "$i"
     done
     inst_hook cmdline 01 "$moddir/parse-kernel.sh"
-    inst_hook pre-pivot 20 "$moddir/kernel-cleanup.sh"
+    inst_hook cleanup 20 "$moddir/kernel-cleanup.sh"
     inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
 
     for _f in modules.builtin.bin modules.builtin; do

diff --git a/modules.d/95terminfo/module-setup.sh b/modules.d/95terminfo/module-setup.sh
index bd1c0e95f7178530b5477066bf4f726148ff8512..6377389211dfe75162fb71a9723d2c35ad81103f 100755 (executable)
--- a/modules.d/95terminfo/module-setup.sh
+++ b/modules.d/95terminfo/module-setup.sh
@@ -15,6 +15,6 @@ install() {
         done
     fi
 
-    inst_hook pre-pivot 20 "${moddir}/terminfo-cleanup.sh"
+    inst_hook cleanup 20 "${moddir}/terminfo-cleanup.sh"
 }
 

diff --git a/modules.d/98syslog/module-setup.sh b/modules.d/98syslog/module-setup.sh
index d316dcb4ced046df259ca0ba7bd1d7d14c146eb6..5579c5a2c9083b9d6be2366d805ae59928b4f7d8 100755 (executable)
--- a/modules.d/98syslog/module-setup.sh
+++ b/modules.d/98syslog/module-setup.sh
@@ -34,7 +34,7 @@ install() {
         dracut_install $_installs
         inst_hook cmdline  90 "$moddir/parse-syslog-opts.sh"
         inst_hook pre-udev 61 "$moddir/syslog-genrules.sh"
-        inst_hook pre-pivot 99 "$moddir/syslog-cleanup.sh"
+        inst_hook cleanup 99 "$moddir/syslog-cleanup.sh"
         inst_simple "$moddir/rsyslogd-start.sh" /sbin/rsyslogd-start
         inst_simple "$moddir/rsyslogd-stop.sh" /sbin/rsyslogd-stop
         mkdir -m 0755 -p ${initdir}/etc/templates

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 9e189da03788b06b9fc4fbc34307f042f7030d35..00431b812a48e0782745400d07aa7f30581c89b8 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -422,6 +422,8 @@ wait_for_loginit
 getarg rd.break rdbreak && emergency_shell -n switch_root "Break before switch_root"
 info "Switching root"
 
+source_hook cleanup
+
 unset PS4
 
 CAPSH=$(command -v capsh)