-#!/bin/sh
-
RAM_ROOT=/tmp/root
export BACKUP_FILE=sysupgrade.tgz # file extracted by preinit
[ "$answer" -gt 0 ]
}
+_v() {
+ [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo "$*" >&2
+}
+
+_vn() {
+ [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo -n "$*" >&2
+}
+
v() {
- [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo "$@"
+ _v "$(date) upgrade: $@"
+ logger -p info -t upgrade "$@"
+}
+
+vn() {
+ _vn "$(date) upgrade: $@"
}
json_string() {
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
- cat "$from" 2>/dev/null | $cmd
+ $cmd <"$from"
+}
+
+get_image_dd() {
+ local from="$1"; shift
+
+ (
+ exec 3>&2
+ ( exec 3>&2; get_image "$from" 2>&1 1>&3 | grep -v -F ' Broken pipe' ) 2>&1 1>&3 \
+ | ( exec 3>&2; dd "$@" 2>&1 1>&3 | grep -v -E ' records (in|out)') 2>&1 1>&3
+ exec 3>&-
+ )
}
get_magic_word() {
}
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() {
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
- *block2mtd=*)
- bootdisk="${cmdline##*block2mtd=}"
- bootdisk="${bootdisk%%,*}"
- ;;
- *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
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"
# $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
default_do_upgrade() {
sync
+ echo 3 > /proc/sys/vm/drop_caches
if [ -n "$UPGRADE_BACKUP" ]; then
get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$UPGRADE_BACKUP" write - "${PART_NAME:-image}"
else
projects / openwrt / staging / wigyori.git / blobdiff