X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/498cc73e5163eb5b4c910d369a0bfc5f46342f70..1590ebe55a43e41b61f0d626b37d1cfd62779cc4:/target/linux/x86/base-files/lib/upgrade/platform.sh

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 6bae07b01..d765c5e6b 100644
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -13,15 +13,19 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-	get_image "$1" > /dev/hda
+	local ROOTFS
 	sync
+	grep -q -e "jffs2" -e "squashfs" /proc/cmdline \
+		&& ROOTFS="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)" \
+		|| ROOTFS="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 ) }' < /proc/cmdline)"
+	[ -b ${ROOTFS%[0-9]} ] && get_image "$1" > ${ROOTFS%[0-9]}
 }
 
 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
+	[ "$SAVE_CONFIG" -eq 1 ] || return 0
 	grep rootfs /proc/mtd >/dev/null || {
 		echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd
 	}