Change all EVMS/evms to EVMS2/evms2 for consitency. Also, enabled dodmraid by default.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@231 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index 302053e4906a8f0b0900e9decb9c0b85422e5c20..462be6351bcfcf67a93a5a8c038f92a95d19593c 100644 (file)
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -78,4 +78,4 @@ NEW_ROOT="/newroot"
 # Only sections that are in by default or those that
 # are not module groups need to be defined here...
 HWOPTS='usb firewire keymap cache evms2 sata lvm2 dmraid'
-MY_HWOPTS='usb firewire sata'
+MY_HWOPTS='usb firewire sata dmraid'

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 6c3a807fdc3977c6d74353017e8a9ee1e7af34a3..f883591cace4d574e96396bbeeaecac8b471ab79 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -427,12 +427,12 @@ startVolumes() {
            /bin/vgchange -ay --ignorelockingfailure
 
            # Disable EVMS since lvm2 is activated and they dont work together.
-           if [ "${USE_EVMS_NORMAL}" -eq '1' ]
+           if [ "${USE_EVMS2_NORMAL}" -eq '1' ]
            then
               bad_msg "Disabling EVMS Support because LVM2 started"
               bad_msg "Do not add dolvm2 to the cmdline if this is not what you want"
               bad_msg "LVM2 and EVMS do not work well together"
-              USE_EVMS_NORMAL=0
+              USE_EVMS2_NORMAL=0
            fi
        
        else
@@ -441,7 +441,7 @@ startVolumes() {
 
     fi
 
-    if [ "${USE_EVMS_NORMAL}" -eq '1' ]
+    if [ "${USE_EVMS2_NORMAL}" -eq '1' ]
     then
        if [ -e '/sbin/evms_activate' ]
        then

diff --git a/generic/linuxrc b/generic/linuxrc
index 4b53dea11e50a8485f98757557b5a60a3cdeac85..005d6541efeb0b2238c87b6f640c2c5eb2c66661 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -111,8 +111,8 @@ do
          DMRAID_OPTS=`parse_opt "${x}"`
          USE_DMRAID_NORMAL=1
          ;;
-      doevms)
-         USE_EVMS_NORMAL=1
+      doevms2)
+         USE_EVMS2_NORMAL=1
          ;;
            # Start Debug Option
       debug)