summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-03-11 13:24:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-15 01:53:02 +0000
commit796fc7784a56b3bbc453154399ef8d6b80eee5f5 (patch)
tree3a609afcb0ed54ff727f492475af2afa2ea0d9f8
parent24ec421e1a76d6263677a98a85b489c35cbe7761 (diff)
downloadpoky-796fc7784a56b3bbc453154399ef8d6b80eee5f5.tar.gz
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]. (From OE-Core rev: d9349e6e28cef107ad8bd00767ceba4d8aa464dd) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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=\([^ ]*\):\([^ ]*\):\([^ ]*\):\([^
9if [ "x$NET_CONF" = "x" ]; then 9if [ "x$NET_CONF" = "x" ]; then
10 # Wired interface is not configured via kernel cmdline 10 # Wired interface is not configured via kernel cmdline
11 # Remove connman config file template 11 # Remove connman config file template
12 rm ${CONFIGF} 12 rm -f ${CONFIGF}
13else 13else
14 # Setup a connman config accordingly 14 # Setup a connman config accordingly
15 sed -i -e "s|^\(IPv4 =\)|\1 ${NET_CONF}|" ${CONFIGF} 15 sed -i -e "s|^\(IPv4 =\)|\1 ${NET_CONF}|" ${CONFIGF}