From: Harald Hoyer <harald@redhat.com>
Date: Tue, 7 Feb 2012 09:32:35 +0000 (+0100)
Subject: more cleanup in pre-pivot
X-Git-Tag: 015~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a178ca6b5c99cc8604837f43ee11b5153fb5268e;p=thirdparty%2Fdracut.git

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
index 000000000..7ca8e8e31
--- /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 37c7c0955..19968544d 100755
--- 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 d6d11e67a..af6c1cc42 100755
--- 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 d17714d46..872985a78 100755
--- 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 3ecd462a7..bd1c0e95f 100755
--- 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
index 000000000..684e33b93
--- /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