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 <s.l-h@gmx.de>
openwrt-18.06
Stefan Lippers-Hollmann 2018-01-18 22:18:36 +01:00 committed by John Crispin
parent 887925b098
commit b36cf0be30
1 changed files with 4 additions and 4 deletions

View File

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