From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Zeffertt <alex.zeffertt@eu.citrix.com>
Subject: [PATCH] fix setopt in buildconfigs/enable-xen-config
Date: Mon, 14 Jun 2010 19:20:44 +0100
Message-ID: <4C1672FC.3020903@eu.citrix.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------040703050704070009060008"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

--------------040703050704070009060008
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit

Regards,

Alex Zeffertt

--------------040703050704070009060008
Content-Type: text/x-diff; name="enable-xen-config-fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="enable-xen-config-fix.patch"

Fix setopt in case where option is already set but to the wrong value

Signed-off-by: Alex Zeffertt <alex.zeffertt@eu.citrix.com>


diff -r 3903d95733f7 buildconfigs/enable-xen-config
--- a/buildconfigs/enable-xen-config	Fri Jun 11 14:04:36 2010 +0100
+++ b/buildconfigs/enable-xen-config	Mon Jun 14 19:00:25 2010 +0100
@@ -15,7 +15,7 @@
 	VALUE=$2
 
 	# First remove any existing instances of this option
-	sed -e "s/^# ${OPTION} is not set$//g ; s/^^{OPTION}=.$//g" -i "${CONFIG}"
+	sed -e "s/^# ${OPTION} is not set$//g ; s/^${OPTION}=.*$//g" -i "${CONFIG}"
 
 	# Then append the new value
 	case ${VALUE} in

--------------040703050704070009060008
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--------------040703050704070009060008--