make bzip2 optional

diff --git a/dracut.spec b/dracut.spec
index 4102bb02308d39339d9cb4a70778a83be3b596d5..91b3451507564c73bceedc72e1cb17af435a6095 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -65,7 +65,6 @@ Obsoletes: dracut-kernel < 005
 Provides:  dracut-kernel = %{version}-%{release}
 
 Requires: bash
-Requires: bzip2
 Requires: coreutils
 Requires: cpio
 Requires: filesystem >= 2.1.0

diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index b4c19e1c596cc5d1a86b1058b635b8f33c0b3f93..d1854c242c7b5898f64eefc78e54a30e9687f98b 100755 (executable)
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -100,8 +100,15 @@ install() {
         # remove unnecessary files
         rm -f "${initdir}${kbddir}/consoletrans/utflist"
         find "${initdir}${kbddir}/" -name README\* -delete
+        find "${initdir}${kbddir}/" -name '*.gz' -print -quit \
+            | while read line; do
+            dracut_install gzip
+            done
 
-        dracut_install gzip bzip2
+        find "${initdir}${kbddir}/" -name '*.bz2' -print -quit \
+            | while read line; do
+            dracut_install bzip2
+            done
     }
 
     install_local_i18n() {

diff --git a/modules.d/99img-lib/module-setup.sh b/modules.d/99img-lib/module-setup.sh
index eead2ab5d0a97092d593721beb8543e479ce98fa..f0e6dacf987f862fcca9d81ccaa9eb0c0ec7fd7f 100755 (executable)
--- a/modules.d/99img-lib/module-setup.sh
+++ b/modules.d/99img-lib/module-setup.sh
@@ -17,7 +17,7 @@ install() {
     dracut_install tar gzip dd
     dracut_install -o cpio xz
     # TODO: make this conditional on a cmdline flag / config option
-    # dracut_install -o bzip2
+    dracut_install -o bzip2
     inst "$moddir/img-lib.sh" "/lib/img-lib.sh"
 }