ipq806x: use absolute the device path in $kernel for the nbg6817 sysupgrade
authorStefan Lippers-Hollmann <s.l-h@gmx.de>
Thu, 18 Jan 2018 21:18:36 +0000 (22:18 +0100)
committerJohn Crispin <john@phrozen.org>
Tue, 13 Feb 2018 11:45:00 +0000 (12:45 +0100)
Harmonize the variable usage for $kernel and $rootfs to always contain
the full device path, instead of just its basename.

Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh

index 3efef8f0ba58e11bdde674f243b402e5ed1baae3..dcd66ea2caba5d94421984dcc07dc91952369764 100644 (file)
@@ -32,8 +32,8 @@ zyxel_do_flash() {
        local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$')
        board_dir=${board_dir%/}
 
-       echo "flashing kernel to /dev/${kernel}"
-       tar xf $tar_file ${board_dir}/kernel -O >/dev/$kernel
+       echo "flashing kernel to $kernel"
+       tar xf $tar_file ${board_dir}/kernel -O >$kernel
 
        echo "flashing rootfs to ${rootfs}"
        tar xf $tar_file ${board_dir}/root -O >"${rootfs}"
@@ -80,10 +80,10 @@ zyxel_do_upgrade() {
        zyxel,nbg6817)
                case "$rootfs" in
                        "/dev/mmcblk0p5")
-                               kernel=mmcblk0p4
+                               kernel="/dev/mmcblk0p4"
                        ;;
                        "/dev/mmcblk0p8")
-                               kernel=mmcblk0p7
+                               kernel="/dev/mmcblk0p7"
                        ;;
                        *)
                                return 1