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

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 19139b37b17218a4397e3be0fee37a435181d2e6..751fe36d20a6634ede57e95cc326046e47e3ad67 100644 (file)
--- 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
 }