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>

diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
index 135a6c19acd73b06f52e89e084e463d16ac9f720..59ebb573bab9b9cee8c8cee4874203fe48962731 100644 (file)
--- 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}