Author: blogic Date: 2014-12-05 01:19:46 +0100 (Fri, 05 Dec 2014) New Revision: 43517
Modified: trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh Log: octeon: sysupgrade: get rootfsdev from kernel cmdline Signed-off-by: Stijn Tintel <[email protected]> Modified: trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh =================================================================== --- trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh 2014-12-05 00:19:40 UTC (rev 43516) +++ trunk/target/linux/octeon/base-files/lib/upgrade/platform.sh 2014-12-05 00:19:46 UTC (rev 43517) @@ -1,12 +1,34 @@ # -# Copyright (C) 2010 OpenWrt.org +# Copyright (C) 2014 OpenWrt.org # . /lib/functions/octeon.sh +platform_get_rootfs() { + local rootfsdev + + if read cmdline < /proc/cmdline; then + case "$cmdline" in + *block2mtd=*) + rootfsdev="${cmdline##*block2mtd=}" + rootfsdev="${rootfsdev%%,*}" + ;; + *root=*) + rootfsdev="${cmdline##*root=}" + rootfsdev="${rootfsdev%% *}" + ;; + esac + + echo "${rootfsdev}" + fi +} + platform_do_upgrade() { local board=$(octeon_board_name) + local rootfs="$(platform_get_rootfs)" + [ -d "${rootfs}" ] || return 1 + case "$board" in erlite) local tar_file="$1" @@ -22,7 +44,7 @@ mount -t vfat /dev/sda1 /boot tar xf $tar_file sysupgrade-erlite/kernel -O > /boot/vmlinux.64 md5sum /boot/vmlinux.64 | cut -f1 -d " " > /boot/vmlinux.64.md5 - tar xf $tar_file sysupgrade-erlite/root -O | dd of=/dev/sda2 bs=4096 + tar xf $tar_file sysupgrade-erlite/root -O | dd of="${rootfs}" bs=4096 sync umount /mnt return 0 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
