[oe-commits] Cristian Iorga : build-appliance-image: fix lost net connectivity after restart

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: d9349e6e28cef107ad8bd00767ceba4d8aa464dd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d9349e6e28cef107ad8bd00767ceba4d8aa464dd

Author: Cristian Iorga <cristian.iorga at intel.com>
Date:   Mon Mar 11 13:24:22 2013 +0200

build-appliance-image: fix lost net connectivity after restart

The issue is that an ethernet config file is removed without
proper checks in place (rm -f), which triggers an error and
makes the connman startup script to fail.

The file is now removed with proper checks in place.

Fixes [YOCTO #4003].

Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 .../connman/connman-conf/qemuall/wired-setup       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
index 135a6c1..59ebb57 100644
--- a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
+++ b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
@@ -9,7 +9,7 @@ NET_CONF=`cat /proc/cmdline |sed -ne 's/^.*ip=\([^ ]*\):\([^ ]*\):\([^ ]*\):\([^
 if [ "x$NET_CONF" = "x" ]; then
 	# Wired interface is not configured via kernel cmdline
 	# Remove connman config file template
-	rm ${CONFIGF}
+	rm -f ${CONFIGF}
 else
 	# Setup a connman config accordingly
 	sed -i -e "s|^\(IPv4 =\)|\1 ${NET_CONF}|" ${CONFIGF}