adds support for mmc on apu2 also adds /usr/bin/find to the ramdisk during flashing. find is busybox, so the space consequences should be tiny.
Signed-off-by: Russell Senior <russ...@personaltelco.net> --- package/base-files/files/lib/upgrade/common.sh | 1 + .../x86/base-files/lib/preinit/79_move_config | 6 +- .../linux/x86/base-files/lib/upgrade/platform.sh | 68 +++++++++++++++------- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 0383d25..08f7d43 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -55,6 +55,7 @@ run_ramfs() { # <command> [...] /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \ /bin/rm /usr/bin/basename /bin/kill /bin/chmod + install_bin /usr/bin/find install_bin /bin/uclient-fetch /bin/wget install_bin /sbin/mtd install_bin /sbin/mount_root diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config index 1d4873d..00d1cb5 100644 --- a/target/linux/x86/base-files/lib/preinit/79_move_config +++ b/target/linux/x86/base-files/lib/preinit/79_move_config @@ -4,8 +4,10 @@ move_config() { . /lib/upgrade/platform.sh - if platform_export_bootpart; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt + if platform_export_bootdev; then + local bootpart="/dev/$(platform_devname_by_partnum 1)" + + mount -t ext4 -o rw,noatime "$bootpart" /mnt mv -f /mnt/sysupgrade.tgz / umount /mnt fi diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 29eac77..8b6598f 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -1,5 +1,20 @@ -platform_export_bootpart() { +platform_devname_by_partnum() { + local uevent + local MAJOR MINOR DEVNAME DEVTYPE + local offset="$1" + for uevent in /sys/class/block/*/uevent; do + . "$uevent" + if [ $BOOTDEV_MAJOR = $MAJOR -a $((BOOTDEV_MINOR + $offset)) = $MINOR ]; then + echo "$DEVNAME" + break + fi + done +} + +platform_export_bootdev() { local cmdline uuid disk + local uevent + local MAJOR MINOR DEVNAME DEVTYPE if read cmdline < /proc/cmdline; then case "$cmdline" in @@ -17,20 +32,25 @@ platform_export_bootpart() { 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/*; do - [ -b "$disk" ] || continue + 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 - export BOOTPART="${disk}1" - return 0 + uevent="/sys/class/block/${disk##*/}/uevent" + break fi done ;; /dev/*) - export BOOTPART="${disk%[0-9]}1" - return 0 + 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 @@ -49,8 +69,10 @@ platform_check_image() { } platform_copy_config() { - if [ -b "$BOOTPART" ]; then - mount -t ext4 -o rw,noatime "$BOOTPART" /mnt + local bootpart="/dev/$(platform_devname_by_partnum 1)" + + if [ -b "$bootpart" ]; then + mount -t ext4 -o rw,noatime "$bootpart" /mnt cp -af "$CONF_TAR" /mnt/ umount /mnt fi @@ -87,18 +109,21 @@ get_partitions() { # <device> <filename> } platform_do_upgrade() { - platform_export_bootpart - disk="${BOOTPART%[0-9]}" + platform_export_bootdev + local disk="$(platform_devname_by_partnum 0)" + local fulldisk="/dev/$disk" + local fullpart + - if [ -b "$disk" ]; then + if [ -b "$fulldisk" ]; then sync if [ "$SAVE_PARTITIONS" = "1" ]; then - get_partitions "$disk" bootdisk + get_partitions "$fulldisk" bootdisk #get block size - if [ -f "/sys/block/${disk##*/}/queue/physical_block_size" ]; then - ibs="$(cat "/sys/block/${disk##*/}/queue/physical_block_size")" + if [ -f "/sys/block/$disk/queue/physical_block_size" ]; then + ibs="$(cat "/sys/block/$disk/queue/physical_block_size")" else ibs=512 fi @@ -114,21 +139,22 @@ platform_do_upgrade() { echo "Partition layout is changed. Full image will be written." ask_bool 0 "Abort" && exit - get_image "$@" | dd of="$disk" bs=4096 conv=fsync + get_image "$@" | dd of="$fulldisk" bs=4096 conv=fsync return 0 fi #iterate over each partition from the image and write it to the boot disk while read part start size; do - echo "Writing image to $disk$part..." - get_image "$@" | dd of="$disk$part" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync + fullpart="/dev/$(platform_devname_by_partnum $part)" + echo "Writing image to $fullpart..." + get_image "$@" | dd of="$fullpart" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync done < /tmp/partmap.image #copy partition uuid - echo "Writing new UUID to $disk$part..." - get_image "$@" | dd of="$disk" bs=1 skip=440 count=4 seek=440 conv=fsync + echo "Writing new UUID to $fulldisk..." + get_image "$@" | dd of="$fulldisk" bs=1 skip=440 count=4 seek=440 conv=fsync else - get_image "$@" | dd of="$disk" bs=4096 conv=fsync + get_image "$@" | dd of="$fulldisk" bs=4096 conv=fsync fi sleep 1 -- 2.8.2 -- Russell Senior, President russ...@personaltelco.net _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev