x86: generate EFI platform bootable images

[openwrt/openwrt.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index a13a6aaf5aefbfcf9178340506c32e71439d9d50..2cbc69e5ddb88c688ec389175d1f34d01efcca2d 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -2,6 +2,8 @@
 
 RAM_ROOT=/tmp/root
 
+export BACKUP_FILE=sysupgrade.tgz      # file extracted by preinit
+
 [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
 libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; }
 
@@ -100,8 +102,26 @@ get_magic_long() {
        (get_image "$@" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
 }
 
+get_magic_gpt() {
+    (get_image "$@" | dd bs=8 count=1 skip=64) 2>/dev/null
+}
+
+get_magic_vfat() {
+    (get_image "$@" | dd bs=1 count=3 skip=54) 2>/dev/null
+}
+
+part_magic_efi() {
+       local magic=$(get_magic_gpt "$@")
+       [ "$magic" = "EFI PART" ]
+}
+
+part_magic_fat() {
+       local magic=$(get_magic_vfat "$@")
+       [ "$magic" = "FAT" ]
+}
+
 export_bootdevice() {
-       local cmdline bootdisk rootpart uuid blockdev uevent line
+       local cmdline bootdisk rootpart uuid blockdev uevent line class
        local MAJOR MINOR DEVNAME DEVTYPE
 
        if read cmdline < /proc/cmdline; then
@@ -134,9 +154,32 @@ export_bootdevice() {
                                        fi
                                done
                        ;;
+                       PARTUUID=????????-????-????-????-??????????02)
+                               uuid="${rootpart#PARTUUID=}"
+                               uuid="${uuid%02}00"
+                               for disk in $(find /dev -type b); do
+                                       set -- $(dd if=$disk bs=1 skip=568 count=16 2>/dev/null | hexdump -v -e '8/1 "%02x "" "2/1 "%02x""-"6/1 "%02x"')
+                                       if [ "$4$3$2$1-$6$5-$8$7-$9" = "$uuid" ]; then
+                                               uevent="/sys/class/block/${disk##*/}/uevent"
+                                               break
+                                       fi
+                               done
+                       ;;
                        /dev/*)
                                uevent="/sys/class/block/${rootpart##*/}/../uevent"
                        ;;
+                       0x[a-f0-9][a-f0-9][a-f0-9] | 0x[a-f0-9][a-f0-9][a-f0-9][a-f0-9] | \
+                       [a-f0-9][a-f0-9][a-f0-9] | [a-f0-9][a-f0-9][a-f0-9][a-f0-9])
+                               rootpart=0x${rootpart#0x}
+                               for class in /sys/class/block/*; do
+                                       while read line; do
+                                               export -n "$line"
+                                       done < "$class/uevent"
+                                       if [ $((rootpart/256)) = $MAJOR -a $((rootpart%256)) = $MINOR ]; then
+                                               uevent="$class/../uevent"
+                                       fi
+                               done
+                       ;;
                esac
 
                if [ -e "$uevent" ]; then
@@ -193,17 +236,34 @@ get_partitions() { # <device> <filename>
                rm -f "/tmp/partmap.$filename"
 
                local part
-               for part in 1 2 3 4; do
-                       set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk")
+               part_magic_efi "$disk" && {
+                       #export_partdevice will fail when partition number is greater than 15, as
+                       #the partition major device number is not equal to the disk major device number
+                       for part in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
+                               set -- $(hexdump -v -n 48 -s "$((0x380 + $part * 0x80))" -e '4/4 "%08x"" "4/4 "%08x"" "4/4 "0x%08X "' "$disk")
+
+                               local type="$1"
+                               local lba="$(( $(hex_le32_to_cpu $4) * 0x100000000 + $(hex_le32_to_cpu $3) ))"
+                               local end="$(( $(hex_le32_to_cpu $6) * 0x100000000 + $(hex_le32_to_cpu $5) ))"
+                               local num="$(( $end - $lba ))"
+
+                               [ "$type" = "00000000000000000000000000000000" ] && continue
 
-                       local type="$(( $(hex_le32_to_cpu $1) % 256))"
-                       local lba="$(( $(hex_le32_to_cpu $2) ))"
-                       local num="$(( $(hex_le32_to_cpu $3) ))"
+                               printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
+                       done
+               } || {
+                       for part in 1 2 3 4; do
+                               set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk")
 
-                       [ $type -gt 0 ] || continue
+                               local type="$(( $(hex_le32_to_cpu $1) % 256))"
+                               local lba="$(( $(hex_le32_to_cpu $2) ))"
+                               local num="$(( $(hex_le32_to_cpu $3) ))"
 
-                       printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
-               done
+                               [ $type -gt 0 ] || continue
+
+                               printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
+                       done
+               }
        fi
 }
 
@@ -218,32 +278,10 @@ indicate_upgrade() {
 # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
 default_do_upgrade() {
        sync
-       if [ "$SAVE_CONFIG" -eq 1 ]; then
-               get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}"
+       if [ -n "$UPGRADE_BACKUP" ]; then
+               get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$UPGRADE_BACKUP" write - "${PART_NAME:-image}"
        else
                get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}"
        fi
        [ $? -ne 0 ] && exit 1
 }
-
-do_upgrade_stage2() {
-       v "Performing system upgrade..."
-       if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
-               platform_do_upgrade "$IMAGE"
-       else
-               default_do_upgrade "$IMAGE"
-       fi
-
-       if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then
-               platform_copy_config
-       fi
-
-       v "Upgrade completed"
-       sleep 1
-
-       v "Rebooting system..."
-       umount -a
-       reboot -f
-       sleep 5
-       echo b 2>/dev/null >/proc/sysrq-trigger
-}