summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-03-11 13:24:22 +0200
committerSaul Wold <sgw@linux.intel.com>2013-03-14 11:29:12 -0700
commitd9349e6e28cef107ad8bd00767ceba4d8aa464dd (patch)
treecd5a480de1b85d014d22cfe535df0a8b8b8355ca
parentef7ac8d9c0cf25834e75b4e5b987589f9ff19dc3 (diff)
downloadopenembedded-core-d9349e6e28cef107ad8bd00767ceba4d8aa464dd.tar.gz
openembedded-core-d9349e6e28cef107ad8bd00767ceba4d8aa464dd.tar.bz2
openembedded-core-d9349e6e28cef107ad8bd00767ceba4d8aa464dd.zip
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@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup2
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 135a6c19ac..59ebb573ba 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}