base-files: add syslog logging for v function

[openwrt/staging/wigyori.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 b44a5998f4e5fa77fbc56c0f0fd1edf4ac4a5787..5c85d986f96e45a5c899ce7b6b4bee37aa6cc9dd 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 RAM_ROOT=/tmp/root
 
 export BACKUP_FILE=sysupgrade.tgz      # file extracted by preinit
@@ -73,6 +71,7 @@ _vn() {
 
 v() {
        _v "$(date) upgrade: $@"
+       logger -p info -t upgrade "$@"
 }
 
 vn() {
@@ -97,8 +96,7 @@ get_image() { # <source> [ <command> ]
        if [ -z "$cmd" ]; then
                local magic="$(dd if="$from" bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
                case "$magic" in
-                       1f8b) cmd="zcat";;
-                       425a) cmd="bzcat";;
+                       1f8b) cmd="busybox zcat";;
                        *) cmd="cat";;
                esac
        fi
@@ -130,7 +128,11 @@ get_magic_gpt() {
 }
 
 get_magic_vfat() {
-       (get_image "$@" | dd bs=1 count=3 skip=54) 2>/dev/null
+       (get_image "$@" | dd bs=3 count=1 skip=18) 2>/dev/null
+}
+
+get_magic_fat32() {
+       (get_image "$@" | dd bs=1 count=5 skip=82) 2>/dev/null
 }
 
 part_magic_efi() {
@@ -140,75 +142,62 @@ part_magic_efi() {
 
 part_magic_fat() {
        local magic=$(get_magic_vfat "$@")
-       [ "$magic" = "FAT" ]
+       local magic_fat32=$(get_magic_fat32 "$@")
+       [ "$magic" = "FAT" ] || [ "$magic_fat32" = "FAT32" ]
 }
 
 export_bootdevice() {
-       local cmdline bootdisk rootpart uuid blockdev uevent line class
+       local cmdline uuid blockdev uevent line class
        local MAJOR MINOR DEVNAME DEVTYPE
+       local rootpart="$(cmdline_get_var root)"
+
+       case "$rootpart" 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]-[a-f0-9][a-f0-9])
+                       uuid="${rootpart#PARTUUID=}"
+                       uuid="${uuid%-[a-f0-9][a-f0-9]}"
+                       for blockdev in $(find /dev -type b); do
+                               set -- $(dd if=$blockdev bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
+                               if [ "$4$3$2$1" = "$uuid" ]; then
+                                       uevent="/sys/class/block/${blockdev##*/}/uevent"
+                                       break
+                               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 read cmdline < /proc/cmdline; then
-               case "$cmdline" in
-                       *root=*)
-                               rootpart="${cmdline##*root=}"
-                               rootpart="${rootpart%% *}"
-                       ;;
-               esac
-
-               case "$bootdisk" in
-                       /dev/*)
-                               uevent="/sys/class/block/${bootdisk##*/}/uevent"
-                       ;;
-               esac
-
-               case "$rootpart" 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]-[a-f0-9][a-f0-9])
-                               uuid="${rootpart#PARTUUID=}"
-                               uuid="${uuid%-[a-f0-9][a-f0-9]}"
-                               for blockdev in $(find /dev -type b); do
-                                       set -- $(dd if=$blockdev bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
-                                       if [ "$4$3$2$1" = "$uuid" ]; then
-                                               uevent="/sys/class/block/${blockdev##*/}/uevent"
-                                               break
-                                       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
-                       while read line; do
-                               export -n "$line"
-                       done < "$uevent"
-                       export BOOTDEV_MAJOR=$MAJOR
-                       export BOOTDEV_MINOR=$MINOR
-                       return 0
-               fi
+       if [ -e "$uevent" ]; then
+               while read line; do
+                       export -n "$line"
+               done < "$uevent"
+               export BOOTDEV_MAJOR=$MAJOR
+               export BOOTDEV_MINOR=$MINOR
+               return 0
        fi
 
        return 1
@@ -239,6 +228,15 @@ hex_le32_to_cpu() {
        echo "$@"
 }
 
+get_partition_by_name() {
+       for partname in /sys/class/block/$1/*/name; do
+               [ "$(cat ${partname})" = "$2" ] && {
+                       basename ${partname%%/name}
+                       break
+               }
+       done
+}
+
 get_partitions() { # <device> <filename>
        local disk="$1"
        local filename="$2"