Merge pull request #899 from fewtarius/dev

Re-order network restart/wifi start, and fix jelos-info reporting.

packages/jelos/sources/scripts/jelos-info

@@ -42,6 +42,9 @@ do
     fi
 done
 
+
+case ${HW_ARCH} in
+  aarch64)
     declare -a CF MF
 
     CNTR=0
@@ -67,6 +70,8 @@ do
       MF+=("CORES ${FIELD}: $(( $(cat ${CPUFREQ}/scaling_max_freq | sort | tail -n 1) / 1000))MHz")
       CNTR=$(( CNTR + 1 ))
     done
+  ;;
+esac
 
 # temperature
 # Unit: millidegree Celsius
@@ -111,6 +116,8 @@ then
   fi
   echo "CPU FAN: ${FANSPEED}"
 fi
+case ${HW_ARCH} in
+  aarch64)
     for C in "${CF[@]}"
     do
       echo ${C}
@@ -119,3 +126,5 @@ for M in "${MF[@]}"
     do
       echo ${M}
     done
+  ;;
+esac

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

@@ -8,12 +8,10 @@ HOSTNAME=$(get_setting system.hostname)
 hostname ${HOSTNAME}
 avahi-set-host-name ${HOSTNAME}
 
-if [ "$(get_setting internal.wifi)" == 0 ] && [ "${DEVICE_INTERNAL_WIFI}" = true ]
+NETCHECK=$(systemctl status connman >/dev/null 2>&1)
+if [ "$?" = "0" ]
 then
-  nohup rmmod ${DEVICE_WIFI_MODULE} &
-  exit 0
-else
-  set_setting internal.wifi 1
+  systemctl restart connman
 fi
 
 if [ "$(get_setting wifi.enabled)" == "0" ] || [ "$1" == "disable" ]
@@ -23,9 +21,3 @@ elif [ "$(get_setting wifi.enabled)" == "1" ] || [ "$1" == "enable" ]
 then
   nohup wifictl enable &
 fi
-
-NETCHECK=$(systemctl status connman >/dev/null 2>&1)
-if [ "$?" = "0" ]
-then
-  systemctl restart connman
-fi