[x86] sysupgrade: Get target device from kernel cmdline, patch from acinonyx

[openwrt.git] / 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 ffd0b93..d765c5e 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -1,8 +1,10 @@
+USE_REFRESH=1
+
 platform_check_image() {
        [ "$ARGC" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
-               48eb) return 0;;
+               eb48) return 0;;
                *)
                        echo "Invalid image type"
                        return 1
@@ -11,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
        }