From 8e6b0de6482090cc8f6a869bab471b786dde20c6 Mon Sep 17 00:00:00 2001
From: Tim Yamin <plasmaroo@gentoo.org>
Date: Thu, 27 Jan 2005 19:27:19 +0000
Subject: [PATCH] Add patch for turning off LVM and EVMS2 optionally at boot
 time even if compiled into initrd; bug #79755.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@164 67a159dc-881f-0410-a524-ba9dfbe2cb84
---
 generic/linuxrc | 12 ++++++++++--
 genkernel       |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/generic/linuxrc b/generic/linuxrc
index f7e5b63..1d5f746 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -8,6 +8,8 @@
 
 USE_DEVFS_NORMAL=1
 USE_UDEV_NORMAL=2
+USE_EVMS_NORMAL=1
+USE_LVM2_NORMAL=1
 
 if [ "$$" != '1' ]
 then
@@ -46,6 +48,12 @@ do
 		nodevfs)
 			USE_DEVFS_NORMAL=0
 		;;
+		nolvm2)
+			USE_LVM2_NORMAL=0
+		;;
+		noevms)
+			USE_EVMS_NORMAL=0
+		;;
 		udev)
 			USE_UDEV_NORMAL=1
 			USE_DEVFS_NORMAL=0
@@ -246,7 +254,7 @@ then
 	devfsd /dev -np
 fi
 
-if [ "${DO_lvm2}" ]
+if [ "${DO_lvm2}" -a "{USE_LVM2_NORMAL}" -eq '1' ]
 then
 	if [ -e '/sbin/vgscan' -a -e '/sbin/vgchange' ]
 	then
@@ -257,7 +265,7 @@ then
 	fi
 fi
 
-if [ "${DO_evms2}" ]
+if [ "${DO_evms2}" -a "{USE_LVM2_NORMAL}" -eq '1' ]
 then
        if [ -e '/sbin/evms_activate' ]
        then
diff --git a/genkernel b/genkernel
index 48d0783..544d8be 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.1.0e'
+GK_V='3.1.0f'
 TEMP='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
-- 
2.26.2