Patchwork [3/3] build-appliance-image: fix lost net connectivity after restart

login
register
mail settings
Submitter Cristian Iorga
Date March 11, 2013, 11:24 a.m.
Message ID <1363001062-18854-4-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/45919/
State Accepted
Commit 796fc7784a56b3bbc453154399ef8d6b80eee5f5
Headers show

Comments

Cristian Iorga - March 11, 2013, 11:24 a.m.
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@intel.com>
---
 meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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}