dracut-functions.sh: move the i2o_scsi to the omit_drivers variable

diff --git a/dracut-functions.sh b/dracut-functions.sh
index aa709193b69607c8dbf30c818a3a47efb846f3d3..5825338a18b78ca4c5dce8708ecfb01508666449 100755 (executable)
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -1478,7 +1478,6 @@ instmods() {
                 ((_ret+=$?))
                 ;;
             --*) _mpargs+=" $_mod" ;;
-            i2o_scsi) return 0;; # Do not load this diagnostic-only module
             *)
                 _mod=${_mod##*/}
                 # if we are already installed, skip this module and go on

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 4cb1890a76cbbb365cb22e607e8b1b721119bcb0..9f4d666c0a45c6467959e3fdac6caebc9a51cb34 100644 (file)
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -2,7 +2,7 @@
 
 # i18n
 i18n_vars="/etc/sysconfig/keyboard:KEYTABLE-KEYMAP /etc/sysconfig/i18n:SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP"
-omit_drivers+=" .*/fs/ocfs/.* "
+omit_drivers+=" .*/fs/ocfs/.*  i2o_scsi"
 stdloglvl=3
 install_items+=" vi /etc/virc ps grep cat rm "
 prefix="/"

diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
index 7b94cf53a3f0c3e6d94ecbbb84c6b592b92035ac..a13caebd686d7c3db4088803082c8596095691d9 100644 (file)
--- a/dracut.conf.d/gentoo.conf.example
+++ b/dracut.conf.d/gentoo.conf.example
@@ -10,3 +10,5 @@ ro_mnt=yes
 
 # i18n
 i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
+
+omit_drivers+=" i2o_scsi"

diff --git a/dracut.conf.d/suse.conf.example b/dracut.conf.d/suse.conf.example
index f25ab01a716d92a79005e32b03312d44cadb36b0..1e7f80eded79a373b55625e362fbd0683205d28d 100644 (file)
--- a/dracut.conf.d/suse.conf.example
+++ b/dracut.conf.d/suse.conf.example
@@ -1,2 +1,3 @@
 i18n_vars="/etc/sysconfig/language:RC_LANG-LANG,RC_LC_ALL-LC_ALL /etc/sysconfig/console:CONSOLE_UNICODEMAP-FONT_UNIMAP,CONSOLE_FONT-FONT,CONSOLE_SCREENMAP-FONT_MAP /etc/sysconfig/keyboard:KEYTABLE-KEYMAP"
+omit_drivers+=" i2o_scsi"