From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 7 Nov 2007 20:03:53 +0000 (+0000)
Subject: Make sure we still allow dolvm2/doevms2 on the kernel command line and give a warning... 
X-Git-Tag: v3.4.10.902~200
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a935750c44425c56e304ba48c673e5bd9e629fc2;p=genkernel.git

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
---

diff --git a/ChangeLog b/ChangeLog
index 20ebcf5..6f9c6f8 100644
--- a/ChangeLog
+++ b/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
diff --git a/gen_compile.sh b/gen_compile.sh
index 70a2c79..333d191 100644
--- a/gen_compile.sh
+++ b/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"'
@@ -534,22 +532,22 @@ compile_dmraid() {
 		cd "${DMRAID_DIR}"
 		print_info 1 'dmraid: >> Configuring...'
 		
-			LDFLAGS="-L${TEMP}/device-mapper/lib" \
-			CFLAGS="-I${TEMP}/device-mapper/include" \
-			CPPFLAGS="-I${TEMP}/device-mapper/include" \
-			./configure --enable-static_link --prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
-				gen_die 'Configure of dmraid failed!'
-				
-			# We dont necessarily have selinux installed yet... look into
-			# selinux global support in the future.
-			sed -i tools/Makefile -e "s|DMRAIDLIBS += -lselinux||g"
-			###echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
+		LDFLAGS="-L${TEMP}/device-mapper/lib" \
+		CFLAGS="-I${TEMP}/device-mapper/include" \
+		CPPFLAGS="-I${TEMP}/device-mapper/include" \
+		./configure --enable-static_link --prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
+			gen_die 'Configure of dmraid failed!'
+
+		# We dont necessarily have selinux installed yet... look into
+		# selinux global support in the future.
+		sed -i tools/Makefile -e "s|DMRAIDLIBS += -lselinux||g"
+		###echo "DMRAIDLIBS += -lselinux -lsepol" >> tools/Makefile
 		mkdir -p "${TEMP}/dmraid"
 		print_info 1 'dmraid: >> Compiling...'
-			compile_generic '' utils
-			#compile_generic 'install' utils
-			mkdir ${TEMP}/dmraid/sbin
-			install -m 0755 -s tools/dmraid "${TEMP}/dmraid/sbin/dmraid"
+		compile_generic '' utils
+		#compile_generic 'install' utils
+		mkdir ${TEMP}/dmraid/sbin
+		install -m 0755 -s tools/dmraid "${TEMP}/dmraid/sbin/dmraid"
 		print_info 1 '      >> Copying to bincache...'
 		cd "${TEMP}/dmraid"
 		/bin/tar -cjf "${DMRAID_BINCACHE}" sbin/dmraid ||
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 49d238a..ebb4423 100644
--- a/generic/initrd.scripts
+++ b/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
 
diff --git a/generic/linuxrc b/generic/linuxrc
index 2bde1fb..7e2e5f8 100644
--- a/generic/linuxrc
+++ b/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'