From: Harald Hoyer <harald@redhat.com>
Date: Wed, 3 Oct 2012 20:36:15 +0000 (-0400)
Subject: dracut-functions.sh: move the i2o_scsi to the omit_drivers variable
X-Git-Tag: 024~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d51eff05fe973bc5631a9ea2e7752192e7e1192;p=thirdparty%2Fdracut.git

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

diff --git a/dracut-functions.sh b/dracut-functions.sh
index aa709193b..5825338a1 100755
--- 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 4cb1890a7..9f4d666c0 100644
--- 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 7b94cf53a..a13caebd6 100644
--- 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 f25ab01a7..1e7f80ede 100644
--- 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"