Make sure we still allow dolvm2/doevms2 on the kernel command line and give a warning. I've also added a 2 second delay between vgscan and vgchange. Thanks to Robin H. Johnson <robbat2@gentoo.org> for suggesting the changes and testing.

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

ChangeLog

@@ -2,6 +2,13 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh,
+  generic/initrd.scripts, generic/linuxrc:
+  Make sure we still allow dolvm2/doevms2 on the kernel command line and give
+  a warning. I've also added a 2 second delay between vgscan and vgchange.
+  Thanks to Robin H. Johnson <robbat2@gentoo.org> for suggesting the changes
+  and testing.
+
   02 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> ++, gen_initramfs.sh,
   gen_initrd.sh, genkernel:
   Reverting the removal of generic/modprobe for bug #197730. This is genkernel

gen_compile.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-compile_kernel_args()
-{
+compile_kernel_args() {
 	local ARGS
 
 	ARGS=''
@@ -207,7 +206,6 @@ compile_generic() {
 	esac
 	shift 2
 
-
 	# the eval usage is needed in the next set of code
 	# as ARGS can contain spaces and quotes, eg:
 	# ARGS='CC="ccache gcc"'

generic/initrd.scripts

@@ -636,6 +636,7 @@ startVolumes() {
 
 			good_msg "Scanning for Volume Groups"
 			/bin/vgscan --ignorelockingfailure --mknodes 2>/dev/null
+			sleep 2
 			good_msg "Activating Volume Groups"
 			/bin/vgchange -ay --ignorelockingfailure 2>/dev/null
 

generic/linuxrc

@@ -108,6 +108,10 @@ do
 		dolvm)
 			USE_LVM_NORMAL=1
 		;;
+		dolvm2)
+			bad_msg 'Using dolvm2 is deprecated, use dolvm, instead.'
+			USE_LVM_NORMAL=1
+		;;
 		domdadm)
 			USE_MDADM=1
 		;;
@@ -121,6 +125,10 @@ do
 		doevms)
 			USE_EVMS_NORMAL=1
 		;;
+		doevms2)
+			bad_msg 'Using doevms2 is deprecated, use doevms, instead.'
+			USE_EVMS_NORMAL=1
+		;;
 		# Debug Options
 		debug)
 			DEBUG='yes'