Merge pull request #1037 from fewtarius/dev

Fix ordering so hostname is set properly.

packages/jelos/sources/scripts/wifictl

@@ -72,6 +72,11 @@ check_wifi() {
 }
 
 connect_wifi() {
+  NETCHECK=$(systemctl status connman >/dev/null 2>&1)
+  if [ ! "$?" = "0" ]
+  then
+    systemctl start connman
+  fi
   STATE=$(get_wifi_state)
   if [ ! "${STATE}" = "online" ]
   then

packages/sysutils/autostart/sources/common/008-network

@@ -8,6 +8,12 @@ HOSTNAME=$(get_setting system.hostname)
 hostname ${HOSTNAME}
 avahi-set-host-name ${HOSTNAME}
 
+NETCHECK=$(systemctl status connman >/dev/null 2>&1)
+if [ "$?" = "0" ]
+then
+  systemctl stop connman
+fi
+
 if [ "$(get_setting wifi.enabled)" == "0" ] || [ "$1" == "disable" ]
 then
   nohup wifictl disable &
@@ -15,3 +21,4 @@ elif [ "$(get_setting wifi.enabled)" == "1" ] || [ "$1" == "enable" ]
 then
   nohup wifictl enable &
 fi
+