From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date: Fri, 22 Mar 2013 08:11:42 +0000 (+0200)
Subject: connman-conf: Avoid appending IPv4 address
X-Git-Tag: yocto-4.0~33498
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da682e752e351e5bb7636ee187db3eabc208c177;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

connman-conf: Avoid appending IPv4 address

If run more than once, the IP addresses would be appended
to IPv4 variable. Avoid that by rewriting the IPv4 always.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
index 59ebb573bab..c46899ef327 100644
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
+++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
@@ -12,5 +12,5 @@ if [ "x$NET_CONF" = "x" ]; then
 	rm -f ${CONFIGF}
 else
 	# Setup a connman config accordingly
-	sed -i -e "s|^\(IPv4 =\)|\1 ${NET_CONF}|" ${CONFIGF}
+	sed -i -e "s|^IPv4 =.*|IPv4 = ${NET_CONF}|" ${CONFIGF}
 fi