From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 27 Jun 2005 19:43:07 +0000 (+0000)
Subject: Change all EVMS/evms to EVMS2/evms2 for consitency.  Also, enabled dodmraid by default.
X-Git-Tag: v3.4.10.902~521
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1cce348bdb9a0becac885de85db4f4ea3cb8a917;p=genkernel.git

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 302053e..462be63 100644
--- 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 6c3a807..f883591 100644
--- 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 4b53dea..005d654 100644
--- 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)