x86: use PARTUUID instead explicitly specifying the device by default

[openwrt/staging/blogic.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 d765c5e6ba472b42b3465f68285c23441594403e..73ab5ef0794c942495d18865fa2c2498b84e63e6 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -1,10 +1,45 @@
-USE_REFRESH=1
+platform_export_bootpart() {
+       local cmdline uuid disk
+
+       if read cmdline < /proc/cmdline; then
+               case "$cmdline" in
+                       *block2mtd=*)
+                               disk="${cmdline##*block2mtd=}"
+                               disk="${disk%%,*}"
+                       ;;
+                       *root=*)
+                               disk="${cmdline##*root=}"
+                               disk="${disk%% *}"
+                       ;;
+               esac
+
+               case "$disk" in
+                       PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
+                               uuid="${disk#PARTUUID=}"
+                               uuid="${uuid%-02}"
+                               for disk in /dev/[hsv]d[a-z]; do
+                                       set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
+                                       if [ "$4$3$2$1" = "$uuid" ]; then
+                                               export BOOTPART="${disk}1"
+                                               return 0
+                                       fi
+                               done
+                       ;;
+                       /dev/*)
+                               export BOOTPART="${disk%[0-9]}1"
+                               return 0
+                       ;;
+               esac
+       fi
+
+       return 1
+}
 
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
-               eb48) return 0;;
+               eb48|eb63) return 0;;
                *)
                        echo "Invalid image type"
                        return 1
@@ -12,22 +47,20 @@ platform_check_image() {
        esac
 }
 
-platform_do_upgrade() {
-       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]}
+platform_copy_config() {
+       if [ -b "$BOOTPART" ]; then
+               mount -t ext4 -o rw,noatime "$BOOTPART" /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() {
+       platform_export_bootpart
+
+       if [ -b "${BOOTPART%[0-9]}" ]; then
+               sync
+               get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync
+               sleep 1
+       fi
 }
-append sysupgrade_pre_upgrade x86_prepare_ext2