[x86] Fix sysupgrade for squashfs, jffs2 and ext4 images

[openwrt/svn-archive/archive.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 ffd0b93ab47ddf572e1019703c55ae17d1febf35..dc4790ba3026fc77c97542ba96fdf12de34fd014 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,25 @@
+USE_REFRESH=1
+
+x86_get_rootfs() {
+       local rootfsdev
+       local rootfstype
+       
+       rootfstype="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "rootfstype") { print $2 }' < /proc/cmdline)"
+       case "$rootfstype" in
+               squashfs|jffs2)
+                       rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)";;
+               ext4)
+                       rootfsdev="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 }' < /proc/cmdline)";;
+       esac
+               
+       echo "$rootfstype:$rootfsdev"
+}
+
 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
@@ -10,18 +27,24 @@ platform_check_image() {
        esac
 }
 
-platform_do_upgrade() {
-       get_image "$1" > /dev/hda
-       sync
+platform_refresh_partitions() {
+       return 0
 }
 
-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_copy_config() {
+       local rootfs="$(x86_get_rootfs)"
+       local rootfsdev="${rootfs##*:}"
+       
+       mount -t ext4 -o rw,noatime "${rootfsdev%[0-9]}1" /mnt
+       cp -af "$CONF_TAR" /mnt/
+       umount /mnt
+}
+
+platform_do_upgrade() {
+       local rootfs="$(x86_get_rootfs)"
+       local rootfsdev="${rootfs##*:}"
+
+       sync
+       [ -b ${rootfsdev%[0-9]} ] && get_image "$@" | dd of=${rootfsdev%[0-9]} bs=4096 conv=fsync
+       sleep 1
 }
-append sysupgrade_pre_upgrade x86_prepare_ext2