From: Florian Fainelli Date: Sun, 28 Mar 2010 11:55:07 +0000 (+0000) Subject: [x86] sysupgrade: Get target device from kernel cmdline, patch from acinonyx X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=3615d95edc8c3b1e2442aeaf20b3a11e1a1c958a [x86] sysupgrade: Get target device from kernel cmdline, patch from acinonyx SVN-Revision: 20538 --- diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index 9871e62c61..d765c5e6ba 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -13,8 +13,12 @@ platform_check_image() { } platform_do_upgrade() { + local ROOTFS sync - get_image "$1" > /dev/sda + grep -q -e "jffs2" -e "squashfs" /proc/cmdline \ + && ROOTFS="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "block2mtd.block2mtd") { print substr($2,1,index($2, ",")-1) }' < /proc/cmdline)" \ + || ROOTFS="$(awk 'BEGIN { RS=" "; FS="="; } ($1 == "root") { print $2 ) }' < /proc/cmdline)" + [ -b ${ROOTFS%[0-9]} ] && get_image "$1" > ${ROOTFS%[0-9]} } x86_prepare_ext2() {