ipq806x: base-files: asrock: fix bootcount include
authorPetr Štetiar <ynezz@true.cz>
Fri, 7 May 2021 13:06:48 +0000 (15:06 +0200)
committerPetr Štetiar <ynezz@true.cz>
Thu, 13 May 2021 13:13:15 +0000 (15:13 +0200)
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 $?.

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>
target/linux/ipq806x/base-files/etc/init.d/bootcount

index 7a54c34dbaca433320e594e86fbb605914750d55..cb32a4ed3568d8dbd86e22746b76de7f4df3f638 100755 (executable)
@@ -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