X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fmvebu%2Fbase-files%2Flib%2Fupgrade%2Flinksys.sh;h=aacaf55667e84f1c6bf98e9327f44c865ffc3d8c;hp=8f5a89aaf681a6ad13c64ff573e039e7e908301b;hb=bfbdeeb3de3da31f7e5f9bd429e079c2d839644a;hpb=81d85a717ad9f0765d56be21953ead02a5a1ab52

diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index 8f5a89aaf6..aacaf55667 100644
--- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 
 linksys_get_target_firmware() {
@@ -19,9 +19,16 @@ linksys_get_target_firmware() {
 		fw_setenv bootcmd "run nandboot"
 	fi
 
+	# re-enable recovery so we get back if the new firmware is broken
+	fw_setenv auto_recovery yes
+
 	echo "$target_firmware"
 }
 
+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() {
 	local magic_long="$(get_magic_long "$1")"
 
@@ -35,20 +42,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 /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
+	sync
+}