aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2021-05-07 15:06:48 +0200
committerPetr Štetiar <ynezz@true.cz>2022-02-26 07:40:43 +0100
commit610b2cff606cdaa7739e38f10b004727acd6cdbf (patch)
tree1afadca869606fdcce9509f973eed1ad11518cc7
parentb99d7aecc83fd180f7a3c3efaae00845e7a73129 (diff)
downloadupstream-610b2cff606cdaa7739e38f10b004727acd6cdbf.tar.gz
upstream-610b2cff606cdaa7739e38f10b004727acd6cdbf.tar.bz2
upstream-610b2cff606cdaa7739e38f10b004727acd6cdbf.zip
ipq806x: base-files: asrock: fix bootcount include
Fixes following error while executing the init script on the buildhost: Enabling boot ./etc/init.d/bootcount: line 5: /lib/upgrade/asrock.sh: No such file or directory Enabling bootcount While at it fix following shellcheck issue: base-files/etc/init.d/bootcount line 11: if [ $? -eq 0 ]; then ^-- SC2181: Check exit code directly with e.g. 'if mycmd;', not indirectly with $?. Fixes: #9345 Cc: Ansuel Smith <ansuelsmth@gmail.com> Cc: Pawel Dembicki <paweldembicki@gmail.com> Cc: Christian Lamparter <chunkeey@gmail.com> Fixes: 98b86296e67d ("ipq806x: add support for ASRock G10") References: https://gitlab.com/ynezz/openwrt/-/jobs/1243290743#L1444 Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit ce8af0ace04bb43e8156940c771b4058fa83d27a)
-rwxr-xr-xtarget/linux/ipq806x/base-files/etc/init.d/bootcount7
1 files changed, 2 insertions, 5 deletions
diff --git a/target/linux/ipq806x/base-files/etc/init.d/bootcount b/target/linux/ipq806x/base-files/etc/init.d/bootcount
index 7a54c34dba..cb32a4ed35 100755
--- a/target/linux/ipq806x/base-files/etc/init.d/bootcount
+++ b/target/linux/ipq806x/base-files/etc/init.d/bootcount
@@ -2,15 +2,12 @@
START=99
-. /lib/upgrade/asrock.sh
+. "$IPKG_INSTROOT/lib/upgrade/asrock.sh"
boot() {
case $(board_name) in
asrock,g10)
- asrock_bootconfig_mangle "bootcheck"
- if [ $? -eq 0 ]; then
- reboot
- fi
+ asrock_bootconfig_mangle "bootcheck" && reboot
;;
edgecore,ecw5410)
fw_setenv bootcount 0