X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fupgrade%2Fcommon.sh;h=fc59bf2323498d332159b00eb7ab443bfe6b147e;hp=11e1b2cdfaa4d49c35a2d7ee7989f703fd62f67e;hb=b2adb9a7b50fd4a887b22facf6795d71a2629397;hpb=94c728dc3949a74762866fe3f3faa75aeb8b8dda diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 11e1b2cdfa..fc59bf2323 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -2,8 +2,8 @@ RAM_ROOT=/tmp/root -ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } -libs() { ldd $* | awk '{print $3}'; } +[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } +libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; } install_file() { # [ ... ] for file in "$@"; do @@ -21,9 +21,6 @@ install_bin() { # [ ... ] files=$1 [ -x "$src" ] && files="$src $(libs $src)" install_file $files - [ -e /lib/ld-linux.so.3 ] && { - install_file /lib/ld-linux.so.3 - } shift for link in "$@"; do { dest="$RAM_ROOT/$link" @@ -33,45 +30,6 @@ install_bin() { # [ ... ] }; done } -pivot() { # - mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1 - mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/overlay && \ - mount -o move /proc $1/proc && \ - pivot_root $1 $1$2 || { - umount $1 $1 - return 1 - } - mount -o move $2/dev /dev - mount -o move $2/tmp /tmp - mount -o move $2/overlay /overlay 2>&- - return 0 -} - -run_ramfs() { # [...] - install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump /bin/sleep /bin/zcat /usr/bin/bzcat - install_bin /sbin/mtd - for file in $RAMFS_COPY_BIN; do - install_bin $file - done - install_file /etc/resolv.conf /etc/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA - - pivot $RAM_ROOT /mnt || { - echo "Failed to switch over to ramfs. Please reboot." - exit 1 - } - - mount -o remount,ro /mnt - umount -l /mnt - - grep /overlay /proc/mounts > /dev/null && { - mount -o remount,ro /overlay - umount -l /overlay - } - - # spawn a new shell from ramdisk to reduce the probability of cache issues - exec /bin/busybox ash -c "$*" -} - run_hooks() { local arg="$1"; shift for func in "$@"; do @@ -102,40 +60,129 @@ v() { [ "$VERBOSE" -ge 1 ] && echo "$@" } +json_string() { + local v="$1" + v="${v//\\/\\\\}" + v="${v//\"/\\\"}" + echo "\"$v\"" +} + rootfs_type() { - mount | awk '($3 ~ /^\/$/) && ($5 !~ /rootfs/) { print $5 }' + /bin/mount | awk '($3 ~ /^\/$/) && ($5 !~ /rootfs/) { print $5 }' } get_image() { # [ ] local from="$1" - local conc="$2" - local cmd - - case "$from" in - http://*|ftp://*) cmd="wget -O- -q";; - *) cmd="cat";; - esac - if [ -z "$conc" ]; then - local magic="$(eval $cmd $from | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')" + local cat="$2" + + if [ -z "$cat" ]; then + local magic="$(dd if="$from" bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')" case "$magic" in - 1f8b) conc="zcat";; - 425a) conc="bzcat";; + 1f8b) cat="zcat";; + 425a) cat="bzcat";; + *) cat="cat";; esac fi - eval "$cmd $from ${conc:+| $conc}" + $cat "$from" 2>/dev/null } get_magic_word() { - get_image "$@" | dd bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"' + (get_image "$@" | dd bs=2 count=1 | hexdump -v -n 2 -e '1/1 "%02x"') 2>/dev/null } get_magic_long() { - get_image "$@" | dd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' + (get_image "$@" | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null +} + +export_bootdevice() { + local cmdline uuid disk uevent + local MAJOR MINOR DEVNAME DEVTYPE + + 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 $(find /dev -type b); 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 + uevent="/sys/class/block/${disk##*/}/uevent" + break + fi + done + ;; + /dev/*) + uevent="/sys/class/block/${disk##*/}/uevent" + ;; + esac + + if [ -e "$uevent" ]; then + . "$uevent" + + export BOOTDEV_MAJOR=$MAJOR + export BOOTDEV_MINOR=$MINOR + return 0 + fi + fi + + return 1 +} + +export_partdevice() { + local var="$1" offset="$2" + local uevent MAJOR MINOR DEVNAME DEVTYPE + + for uevent in /sys/class/block/*/uevent; do + . "$uevent" + if [ $BOOTDEV_MAJOR = $MAJOR -a $(($BOOTDEV_MINOR + $offset)) = $MINOR -a -b "/dev/$DEVNAME" ]; then + export "$var=$DEVNAME" + return 0 + fi + done + + return 1 } -refresh_mtd_partitions() { - mtd refresh rootfs +get_partitions() { # + local disk="$1" + local filename="$2" + + if [ -b "$disk" -o -f "$disk" ]; then + v "Reading partition table from $filename..." + + local magic="$(hexdump -v -n 2 -s 0x1FE -e '1/2 "0x%04X"' "$disk")" + if [ "$magic" != 0xAA55 ]; then + v "Invalid partition table on $disk" + exit + fi + + 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") + + local type="$(($1 % 256))" + local lba="$(($2))" + local num="$(($3))" + + [ $type -gt 0 ] || continue + + printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename" + done + fi } jffs2_copy_config() { @@ -148,42 +195,39 @@ jffs2_copy_config() { fi } +# Flash firmware to MTD partition +# +# $(1): path to image +# $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m default_do_upgrade() { sync - if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then - get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}" + if [ "$SAVE_CONFIG" -eq 1 ]; then + get_image "$1" "$2" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}" else - get_image "$1" | mtd write - "${PART_NAME:-image}" + get_image "$1" "$2" | mtd write - "${PART_NAME:-image}" fi } -do_upgrade() { +do_upgrade_stage2() { v "Performing system upgrade..." - if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then - platform_do_upgrade "$ARGV" + if [ -n "$do_upgrade" ]; then + $do_upgrade "$IMAGE" + elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then + platform_do_upgrade "$IMAGE" else - default_do_upgrade "$ARGV" + default_do_upgrade "$IMAGE" + fi + + if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then + platform_copy_config fi - [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { - v "Refreshing partitions" - if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then - platform_refresh_partitions - else - refresh_mtd_partitions - fi - if type 'platform_copy_config' >/dev/null 2>/dev/null; then - platform_copy_config - else - jffs2_copy_config - fi - } v "Upgrade completed" - [ -n "$DELAY" ] && sleep "$DELAY" - ask_bool 1 "Reboot" && { - v "Rebooting system..." - reboot -f - sleep 5 - echo b 2>/dev/null >/proc/sysrq-trigger - } + sleep 1 + + v "Rebooting system..." + umount -a + reboot -f + sleep 5 + echo b 2>/dev/null >/proc/sysrq-trigger }