ramips: enable image commandline hack and cmdline partition parsing

[openwrt.git] / target / linux / rb532 / base-files / sbin / wget2nand

diff --git a/target/linux/rb532/base-files/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
index 67e4a94..57f4128 100755 (executable)
--- a/target/linux/rb532/base-files/sbin/wget2nand
+++ b/target/linux/rb532/base-files/sbin/wget2nand
@@ -23,9 +23,9 @@ url=$1
        echo "No URL specified for image TGZ"
        echo "Usage : $0 URL"
        exit 1
-} 
+}
 
-boot="$(find_mtd_part 'RouterBoard NAND Boot')"
+boot="$(find_mtd_part 'Routerboard NAND Boot')"
 main="$(find_mtd_part 'rootfs')"
 [ -z "$boot" -o -z "$main" ] && {
        echo "Cannot find NAND Flash partitions"
@@ -44,8 +44,8 @@ mount -t yaffs2 "$main" /tmp/wget2nand/
 mount -t yaffs2 "$boot" /tmp/wget2nand-boot
 
 echo "Copying filesystem..."
-( wget -O - $url/openwrt-rb532-2.6-rootfs.tgz) | ( cd /tmp/wget2nand/; tar xvz )
-wget -O /tmp/wget2nand-boot/kernel $url/openwrt-rb532-2.6-vmlinux 
+( wget -O - $url/openwrt-rb532-rootfs.tgz) | ( cd /tmp/wget2nand/; tar xvz )
+wget -O /tmp/wget2nand-boot/kernel $url/openwrt-rb532-vmlinux
 
 # No need to patch the kernel, this was done during the build process
 chmod +x /tmp/wget2nand-boot/kernel
@@ -55,6 +55,12 @@ echo "chmod ugo+x /" > /tmp/wget2nand/etc/uci-defaults/set_root_permission
 sync
 ls /tmp/wget2nand-boot/
 ls /tmp/wget2nand/
+# use kexec if present
+[ -x /usr/bin/kexec ] && {
+       kexec -l /tmp/wget2nand-boot/kernel --command-line="$(cat /proc/cmdline) root=$main rootfstype=yaffs2"
+       kexec -e
+}
+
 # unmount the partitions and remove the directories into which they were mounted
 umount /tmp/wget2nand-boot
 umount /tmp/wget2nand