From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Sat, 6 Aug 2005 12:10:29 +0000 (+0000)
Subject: Fixed config parsing for dmraid/lvm2 to only set =m if item is not set.  Closing... 
X-Git-Tag: v3.4.10.902~451
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c38210c1af6644cdf70a111dbb5f5d98ac9b090;p=genkernel.git

Fixed config parsing for dmraid/lvm2 to only set =m if item is not set.  Closing bug #101535.


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

diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 19139b3..751fe36 100644
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -105,14 +105,14 @@ config_kernel() {
 	# Make sure lvm2 modules are on if --lvm2
 	if isTrue ${CMD_LVM2}
 	then
-		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM[ =].*/CONFIG_BLK_DEV_DM=m/g'
-		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_SNAPSHOT[ =].*/CONFIG_DM_SNAPSHOT=m/g'
-		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MIRROR[ =].*/CONFIG_DM_MIRROR=m/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_SNAPSHOT is.*/CONFIG_DM_SNAPSHOT=m/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MIRROR is.*/CONFIG_DM_MIRROR=m/g'
 	fi
 
 	# Make sure dmraid modules are on if --dmraid
 	if isTrue ${CMD_DMRAID}
 	then
-		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM[ =].*/CONFIG_BLK_DEV_DM=m/g'
+		sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
 	fi
 }