imonitor: do not check the ubus call before restarting questd

Do no check the ubus call before restarting questd
	because in some cases the ubus call still works as normal,
	even if there are 2 questd processes running.

ice-client/Makefile

@@ -20,13 +20,13 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
 BASE_PKG_VERSION:=4.3.0
-PKG_RELEASE:=RC10
+PKG_RELEASE:=RC13
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=f133275635c84968be8207eaa787dd82beed24c1
+PKG_SOURCE_VERSION:=e688de3925debceee8f82d7c50cacd3c90ee1bc1
 ifeq ($(CONFIG_ICE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-03-24
+PKG_VERSION:=3.0-2017-04-26
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d99d4a513759f754aaaeb06a7ef667de1df59f61
+PKG_SOURCE_VERSION:=3caab8f4ae74b2fbdd29eab839c7856a2cd261fc
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -122,11 +122,11 @@ endif
 
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults

inteno-netmodes/files/etc/init.d/netmode

@@ -59,11 +59,18 @@ populate_netmodes() {
 	lan5=$(get_device LAN5)
 
 	for file in $(find $modedir -type f); do
-		grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
-		grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
-		grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
-		grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
-		grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
+		conf="$(echo $file | cut -d'/' -f5)"
+		if [ "$conf" == "network" ]; then
+			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
+			grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
+			grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
+			grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
+			grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
+
+			ifname="$(uci -q get $file.wan.ifname | sed 's/[ \t]*$//')"
+			uci -q set $file.wan.ifname="$ifname"
+			uci -q commit $file
+		fi
 	done
 
 	local hardware=$(db get hw.board.hardware)

iup/files/sbin/iup

@@ -228,13 +228,14 @@ handle_provisioning() {
 		  retry=$((retry+1))
 		  fi
 		done
-	fi
-	if [ ! -s "$IUPCONFFILES" ]; then
-		echo "File not Found"
-		reboot="off"
-		CONF=0
-	else
-		handle_Downloaded_file $deckey
+
+		if [ ! -s "$IUPCONFFILES" ]; then
+			echo "File not Found"
+			reboot="off"
+			CONF=0
+		else
+			handle_Downloaded_file $deckey
+		fi
 	fi
 }
 

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.38
 
-PKG_SOURCE_VERSION:=f241dd296dc22301093bc98a4d623ab47fa5feee
+PKG_SOURCE_VERSION:=a6b12a910caf7c1e1b868f4f97ed004ca2bacf03
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

questd/files/sbin/imonitor

@@ -35,7 +35,7 @@ UBUS_TIMEOUT=5
 
 
 BSDBIN=$(which bsd)
-
+ACSDBIN=$(which acsd)
 
 restart_questd()
 {
@@ -139,6 +139,31 @@ check_bsdcall()
 }
 
 
+restart_acsd()
+{
+	logger -s -t $0[$$] "Restarting acsd."
+	killall -q -KILL acsd
+	acsd &
+}
+
+check_acsd()
+{
+	local topline pcpu p
+
+	topline=$(top -bn1 | grep "[a]csd")
+	pcpu=$(echo -en "$topline" | awk '{print $7}')
+
+	for p in $pcpu; do
+		p=${p%%%*}
+		if [ "$p" -ge "20" ]; then
+			return 1
+		fi
+	done
+
+	return 0
+}
+
+
 main()
 {
 	local topline nproc mem pcpu
@@ -168,7 +193,8 @@ main()
 			"$restart_mem"   = "1" -o \
 			"$restart_pcpu"  = "1" ]
 		then
-			check_ubuscall || restart_questd
+			# check_ubuscall || restart_questd
+			restart_questd
 		fi
 
 		if [ "$BSDBIN" ] ; then
@@ -179,6 +205,10 @@ main()
 			fi
 		fi
 
+		if [ "$ACSDBIN" ] ; then
+			check_acsd || restart_acsd
+		fi
+
 		# sleep
 		if [ "$sample" -lt "$SAMPLES" ]; then
 			sample=$((sample + 1))