treewide: use new procd sysupgrade $UPGRADE_BACKUP variable

[openwrt/staging/dedeckeh.git] / target / linux / mvebu / base-files / lib / upgrade / linksys.sh

diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index 8f5a89aaf681a6ad13c64ff573e039e7e908301b..ca64a0edf135d9776a90cf68312e9e6604e392e5 100644 (file)
--- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
@@ -1,25 +1,51 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 
 linksys_get_target_firmware() {
+
+       local cur_boot_part mtd_ubi0
+
        cur_boot_part=`/usr/sbin/fw_printenv -n boot_part`
-       target_firmware=""
-       if [ "$cur_boot_part" = "1" ]
-       then
-               # current primary boot - update alt boot
-               target_firmware="kernel2"
-               fw_setenv boot_part 2
-               fw_setenv bootcmd "run altnandboot"
-       elif [ "$cur_boot_part" = "2" ]
-       then
-               # current alt boot - update primary boot
-               target_firmware="kernel1"
-               fw_setenv boot_part 1
-               fw_setenv bootcmd "run nandboot"
+       if [ -z "${cur_boot_part}" ] ; then
+               mtd_ubi0=$(cat /sys/devices/virtual/ubi/ubi0/mtd_num)
+               case $(egrep ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in
+               kernel1|rootfs1)
+                       cur_boot_part=1
+                       ;;
+               kernel2|rootfs2)
+                       cur_boot_part=2
+                       ;;
+               esac
+               >&2 printf "Current boot_part='%s' selected from ubi0/mtd_num='%s'" \
+                       "${cur_boot_part}" "${mtd_ubi0}"
        fi
 
-       echo "$target_firmware"
+       case $cur_boot_part in
+       1)
+               fw_setenv -s - <<-EOF
+                       boot_part 2
+                       bootcmd "run altnandboot"
+               EOF
+               printf "kernel2"
+               return
+               ;;
+       2)
+               fw_setenv -s - <<-EOF
+                       boot_part 1
+                       bootcmd "run nandboot"
+               EOF
+               printf "kernel1"
+               return
+               ;;
+       *)
+               return
+               ;;
+       esac
+}
+
+linksys_get_root_magic() {
+       (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
 }
 
 platform_do_upgrade_linksys() {
@@ -35,20 +61,38 @@ platform_do_upgrade_linksys() {
                exit 1
        fi
 
-       # we don't know, what filesystem does the other partition use,
-       # nuke it tobe safe
-       mtd erase $part_label
-       get_image "$1" | mtd -n write - $part_label
-}
+       local target_mtd=$(find_mtd_part $part_label)
 
-linksys_preupgrade() {
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
-       export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
+       [ "$magic_long" = "73797375" ] && {
+               CI_KERNPART="$part_label"
+               if [ "$part_label" = "kernel1" ]
+               then
+                       CI_UBIPART="rootfs1"
+               else
+                       CI_UBIPART="rootfs2"
+               fi
 
-       [ -f /tmp/sysupgrade.tgz ] && {
-               cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
+               nand_upgrade_tar "$1"
+       }
+       [ "$magic_long" = "27051956" -o "$magic_long" = "0000a0e1" ] && {
+               # check firmwares' rootfs types
+               local target_mtd=$(find_mtd_part $part_label)
+               local oldroot="$(linksys_get_root_magic $target_mtd)"
+               local newroot="$(linksys_get_root_magic "$1")"
+
+               if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]
+               # we're upgrading from a firmware with UBI to one with UBI
+               then
+                       # erase everything to be safe
+                       mtd erase $part_label
+                       get_image "$1" | mtd -n write - $part_label
+               else
+                       get_image "$1" | mtd write - $part_label
+               fi
        }
 }
 
-append sysupgrade_pre_upgrade linksys_preupgrade
+platform_copy_config_linksys() {
+       cp -f "$UPGRADE_BACKUP" "/tmp/syscfg/$BACKUP_FILE"
+       sync
+}