X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fx86%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=8850917062618985126b5086dccfe11506ed1fbb;hb=6f61d8511eccf2736fd7f430aff2c98c595fa4b9;hp=ffd0b93ab47ddf572e1019703c55ae17d1febf35;hpb=438dfe5c6fbfa63f5841fda9b4ec44b2f7712674;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index ffd0b93ab4..8850917062 100644
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -1,8 +1,8 @@
 platform_check_image() {
-	[ "$ARGC" -gt 1 ] && return 1
+	[ "$#" -gt 1 ] && return 1
 
 	case "$(get_magic_word "$1")" in
-		48eb) return 0;;
+		eb48|eb63) return 0;;
 		*)
 			echo "Invalid image type"
 			return 1
@@ -10,18 +10,63 @@ platform_check_image() {
 	esac
 }
 
-platform_do_upgrade() {
-	get_image "$1" > /dev/hda
-	sync
+platform_copy_config() {
+	local partdev
+
+	if export_partdevice partdev 1; then
+		mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
+		cp -af "$CONF_TAR" /mnt/
+		umount /mnt
+	fi
 }
 
-x86_prepare_ext2() {
-	# if we're running from ext2, we need to make sure that we have a mtd 
-	# partition that points to the active rootfs partition.
-	# however this only matters if we actually need to preserve the config files
-	[ "$SAVE_CONFIG" -eq 1 ] && return 0
-	grep rootfs /proc/mtd >/dev/null || {
-		echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd
-	}
+platform_do_upgrade() {
+	local diskdev partdev ibs diff
+
+	if export_bootdevice && export_partdevice diskdev 0; then
+		sync
+		if [ "$SAVE_PARTITIONS" = "1" ]; then
+			get_partitions "/dev/$diskdev" bootdisk
+
+			#get block size
+			if [ -f "/sys/block/$diskdev/queue/physical_block_size" ]; then
+				ibs="$(cat "/sys/block/$diskdev/queue/physical_block_size")"
+			else
+				ibs=512
+			fi
+
+			#extract the boot sector from the image
+			get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
+
+			get_partitions /tmp/image.bs image
+
+			#compare tables
+			diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
+			if [ -n "$diff" ]; then
+				echo "Partition layout is changed.  Full image will be written."
+				ask_bool 0 "Abort" && exit
+
+				get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
+				return 0
+			fi
+
+			#iterate over each partition from the image and write it to the boot disk
+			while read part start size; do
+				if export_partdevice partdev $part; then
+					echo "Writing image to /dev/$partdev..."
+					get_image "$@" | dd of="/dev/$partdev" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
+				else
+					echo "Unable to find partition $part device, skipped."
+				fi
+			done < /tmp/partmap.image
+
+			#copy partition uuid
+			echo "Writing new UUID to /dev/$diskdev..."
+			get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
+		else
+			get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
+		fi
+
+		sleep 1
+	fi
 }
-append sysupgrade_pre_upgrade x86_prepare_ext2