From b36cf0be302b6fc86754be56f478d1d3354c6cfb Mon Sep 17 00:00:00 2001 From: Stefan Lippers-Hollmann Date: Thu, 18 Jan 2018 22:18:36 +0100 Subject: [PATCH] ipq806x: use absolute the device path in $kernel for the nbg6817 sysupgrade 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 --- target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh index 3efef8f0ba..dcd66ea2ca 100644 --- a/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh +++ b/target/linux/ipq806x/base-files/lib/upgrade/zyxel.sh @@ -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