From: Stan Grishin <stangri@melmac.net>
Date: Wed, 7 Apr 2021 03:59:42 +0000 (+0000)
Subject: luci-app-advanced-reboot: support 5.10 kernel on Zyxel
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6555a47cd08263ef56243784b9178ca587bc1506;p=project%2Fluci.git

luci-app-advanced-reboot: support 5.10 kernel on Zyxel

Signed-off-by: Stan Grishin <stangri@melmac.net>
---

diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile
index 9f717d5cbc..8b3f709dfa 100644
--- a/applications/luci-app-advanced-reboot/Makefile
+++ b/applications/luci-app-advanced-reboot/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
-PKG_VERSION:=1.0.0-1
+PKG_VERSION:=1.0.1-1
 
 LUCI_TITLE:=Advanced Linksys Reboot Web UI
 LUCI_URL:=https://docs.openwrt.melmac.net/luci-app-advanced-reboot/
diff --git a/applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js b/applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js
index c9cc20bec0..f4acb8285d 100644
--- a/applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js
+++ b/applications/luci-app-advanced-reboot/htdocs/luci-static/resources/view/system/advanced_reboot.js
@@ -8,7 +8,8 @@
 return view.extend({
 	translateTable: {
 		NO_BOARD_NAME : function(args) { return _('Unable to find Device Board Name.')},
-		NO_DUAL_FLAG : function(args) {return _('Unable to find Dual Boot Flag Partition.')},
+		NO_DUAL_FLAG: function (args) { return _('Unable to find Dual Boot Flag Partition.') },
+		NO_DUAL_FLAG_BLOCK: function (args) { return _('The Dual Boot Flag Partition: %s is not a block device.').format(args[0])},
 		ERR_SET_DUAL_FLAG : function(args) { return _('Unable to set Dual Boot Flag Partition entry for partition: %s.').format(args[0])},
 		NO_FIRM_ENV : function(args) { return _('Unable to obtain firmware environment variable: %s.').format(args[0])},
 		ERR_SET_ENV : function(args) { return _('Unable to set firmware environment variable: %s to %s.').format(args[0],args[1])}
diff --git a/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot b/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot
index c5dfd74a18..7ee2ec8ba2 100755
--- a/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot
+++ b/applications/luci-app-advanced-reboot/root/usr/libexec/rpcd/luci.advanced_reboot
@@ -100,7 +100,7 @@ find_device_data(){
 print_json() { json_init; json_add_string "$1" "$2"; json_dump; json_cleanup; }
 
 obtain_device_info(){
-	local romBoardName p zyxelFlagPartition
+	local romBoardName p zyxelFlagPartition i
 	local vendorName deviceName partition1MTD partition2MTD labelOffset
 	local bootEnv1 bootEnv1Partition1Value bootEnv1Partition2Value
 	local bootEnv2 bootEnv2Partition1Value bootEnv2Partition2Value
@@ -167,15 +167,20 @@ obtain_device_info(){
 			current_partition="$(/usr/sbin/fw_printenv -n "${bootEnv1}")"
 		fi
 	else
+		for i in '0:dual_flag' '0:DUAL_FLAG'; do
+			zyxelFlagPartition="$(find_mtd_part "$i" 2>/dev/null)"
+			[ -n "$zyxelFlagPartition" ] && break
+		done
 		if [ -z "$zyxelFlagPartition" ]; then
-			zyxelFlagPartition="$(find_mtd_part 0:DUAL_FLAG 2>/dev/null)"
-		fi
-		if [ -n "$zyxelFlagPartition" ]; then
-			current_partition="$(dd if="${zyxelFlagPartition}" bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 "%d"')"
-		else
 			print_json 'error' 'NO_DUAL_FLAG'
 			logger "Unable to find Dual Boot Environment or Dual Boot Flag Partition."
 			return
+		elif [ ! -b "$zyxelFlagPartition" ]; then
+			print_json 'error' 'NO_DUAL_FLAG_BLOCK'
+			logger "The Dual Boot Flag Partition: $zyxelFlagPartition is not block device."
+			return
+		else
+			current_partition="$(dd if="${zyxelFlagPartition}" bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 "%d"')"
 		fi
 	fi
 
@@ -202,7 +207,6 @@ obtain_device_info(){
 		p2_os="$p2_os (Linux ${p2_version})"
 	fi
 
-
 	json_init
 	json_add_int 'current_partition' "$current_partition"
 	json_add_string 'device_name' "$vendorName $deviceName"
@@ -231,7 +235,7 @@ obtain_device_info(){
 }
 
 toggle_boot_partition(){
-	local zyxelFlagPartition zyxelBootFlag zyxelNewBootFlag curEnvSetting newEnvSetting
+	local zyxelFlagPartition i zyxelBootFlag zyxelNewBootFlag curEnvSetting newEnvSetting
 	local romBoardName p
 	local bev1 bev2 bev1p1 bev1p2 bev2p1 bev2p2
 	local vendorName deviceName partition1MTD partition2MTD labelOffset
@@ -333,12 +337,17 @@ toggle_boot_partition(){
 		json_init
 		json_dump; json_cleanup;
 	else # NetGear device
+		for i in '0:dual_flag' '0:DUAL_FLAG'; do
+			zyxelFlagPartition="$(find_mtd_part "$i" 2>/dev/null)"
+			[ -n "$zyxelFlagPartition" ] && break
+		done
 		if [ -z "$zyxelFlagPartition" ]; then
-			zyxelFlagPartition="$(find_mtd_part 0:DUAL_FLAG 2>/dev/null)"
-		fi
-		if [ -z "$zyxelFlagPartition" ]; then
-			logger "Unable to find Dual Boot Flag Partition."
 			print_json 'error' 'NO_DUAL_FLAG'
+			logger "Unable to find Dual Boot Environment or Dual Boot Flag Partition."
+			return
+		elif [ ! -b "$zyxelFlagPartition" ]; then
+			print_json 'error' 'NO_DUAL_FLAG_BLOCK'
+			logger "The Dual Boot Flag Partition: $zyxelFlagPartition is not block device."
 			return
 		else
 			zyxelBootFlag="$(dd if="${zyxelFlagPartition}" bs=1 count=1 2>/dev/null | hexdump -n 1 -e '1/1 "%d"')"