more cleanup in pre-pivot

diff --git a/modules.d/10i18n/i18n-cleanup.sh b/modules.d/10i18n/i18n-cleanup.sh
new file mode 100755 (executable)
index 0000000..7ca8e8e
--- /dev/null
+++ b/modules.d/10i18n/i18n-cleanup.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+rm -fr /usr/lib/kbd

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index 37c7c09553bb209383d899328b80915a20fed0e2..19968544d10c5db858c0abf9c0506a078afff873 100755 (executable)
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -87,6 +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"
     }
 
     install_all_kbd() {

diff --git a/modules.d/50plymouth/plymouth-cleanup.sh b/modules.d/50plymouth/plymouth-cleanup.sh
index d6d11e67ada02cadb05703a83e7b97f38a4e23c5..af6c1cc42e1d4955d5bb9570c27d2d263f1a0062 100755 (executable)
--- a/modules.d/50plymouth/plymouth-cleanup.sh
+++ b/modules.d/50plymouth/plymouth-cleanup.sh
@@ -2,4 +2,4 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-rm -fr /usr/share/plymouth /usr/lib/plymouth /usr/lib64/plymouth
+rm -fr /usr/share/plymouth /usr/lib/plymouth /usr/lib64/plymouth /usr/share/pixmaps

diff --git a/modules.d/90kernel-modules/kernel-cleanup.sh b/modules.d/90kernel-modules/kernel-cleanup.sh
index d17714d465f6f507bf5fcb3f8a2136652c257cd5..872985a78a22a62eac9e48d0a521d39ca4becc18 100755 (executable)
--- a/modules.d/90kernel-modules/kernel-cleanup.sh
+++ b/modules.d/90kernel-modules/kernel-cleanup.sh
@@ -2,4 +2,4 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-rm -fr /lib/modules
\ No newline at end of file
+rm -fr /lib/modules /lib/firmware

diff --git a/modules.d/95terminfo/module-setup.sh b/modules.d/95terminfo/module-setup.sh
index 3ecd462a7039280721d88cc6dee325a094a38ea6..bd1c0e95f7178530b5477066bf4f726148ff8512 100755 (executable)
--- a/modules.d/95terminfo/module-setup.sh
+++ b/modules.d/95terminfo/module-setup.sh
@@ -14,5 +14,7 @@ install() {
             inst_simple $f
         done
     fi
+
+    inst_hook pre-pivot 20 "${moddir}/terminfo-cleanup.sh"
 }
 

diff --git a/modules.d/95terminfo/terminfo-cleanup.sh b/modules.d/95terminfo/terminfo-cleanup.sh
new file mode 100755 (executable)
index 0000000..684e33b
--- /dev/null
+++ b/modules.d/95terminfo/terminfo-cleanup.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+rm -fr /usr/lib/terminfo