lua: Fixed some cross-platform issues for PPC (and probably other architectures)

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

diff --git a/target/linux/adm5120/router_le/base-files/sbin/wget2nand b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
index adb56b9..50e9ddb 100755 (executable)
--- a/target/linux/adm5120/router_le/base-files/sbin/wget2nand
+++ b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
@@ -8,57 +8,66 @@
 # Based on cf2nand from RB532 support
 . /etc/functions.sh
 
 # Based on cf2nand from RB532 support
 . /etc/functions.sh
 

-[ -d /tmp/wget2nand ] && {
-       echo "/tmp/wget2nand already exists"
+[ -d /tmp/wget2nand-rootfs ] && {
+       echo "/tmp/wget2nand-rootfs already exists"

        exit 1
 }
 
        exit 1
 }
 

-# first get an address for br-lan using udhcpc
-killall udhcpc
-/sbin/udhcpc -i br-lan
+[ -d /tmp/wget2nand-kernel ] && {
+       echo "/tmp/wget2nand-kernel already exists"
+       exit 1
+}

 
 # need to find the wget server from the command line
 url=$1
 [ -z "$url" ] && {
 
 # need to find the wget server from the command line
 url=$1
 [ -z "$url" ] && {

-       echo "No URL specified for image TGZ"
-       echo "Usage : $0 URL"
-       exit 1
-} 
+        echo "No URL specified for image TGZ"
+        echo "Usage : $0 URL"
+        exit 1
+}
+
+# first get an address for br-lan using udhcpc
+killall udhcpc
+/sbin/udhcpc -i br-lan

 
 

-boot="$(find_mtd_part 'RouterBoard NAND Boot')"
-main="$(find_mtd_part 'rootfs')"
-[ -z "$boot" -o -z "$main" ] && {
+mtd_kernel="$(find_mtd_part 'kernel')"
+mtd_rootfs="$(find_mtd_part 'rootfs')"
+[ -z "$mtd_kernel" -o -z "$mtd_rootfs" ] && {

        echo "Cannot find NAND Flash partitions"
        exit 1
 }
 
        echo "Cannot find NAND Flash partitions"
        exit 1
 }
 

-echo "Erasing filesystem."
-mtd erase Boot 2>/dev/null >/dev/null
-mtd erase Main 2>/dev/null >/dev/null
+echo "Erasing filesystem..."
+mtd erase kernel 2>/dev/null >/dev/null
+mtd erase rootfs 2>/dev/null >/dev/null
+
+echo "Mounting $mtd_rootfs as new root and $mtd_kernel as kernel partition"

 
 

-echo "Mounting $main as new root and $boot as boot partition"
+mkdir /tmp/wget2nand-rootfs
+mkdir /tmp/wget2nand-kernel
+mount -t yaffs2 "$mtd_rootfs" /tmp/wget2nand-rootfs
+mount -t yaffs2 "$mtd_kernel" /tmp/wget2nand-kernel

 
 

-mkdir /tmp/wget2nand/
-mkdir /tmp/wget2nand-boot
-mount -t yaffs2 "$main" /tmp/wget2nand/
-mount -t yaffs2 "$boot" /tmp/wget2nand-boot
+echo "Erasing existing files..."
+rm -rf /tmp/wget2nand-rootfs/*

 
 echo "Copying filesystem..."
 
 echo "Copying filesystem..."

-( wget -O - $url/openwrt-adm5120-2.6-rootfs.tgz) | ( cd /tmp/wget2nand/; tar xvz )
-wget -O /tmp/wget2nand-boot/kernel $url/openwrt-adm5120-2.6-rb1xx-vmlinux
+( wget -O - $url/openwrt-adm5120-rootfs.tgz) | ( cd /tmp/wget2nand-rootfs/; tar xvz )
+# RouterBOOT is looking for a kernel named "kernel"
+wget -O /tmp/wget2nand-kernel/kernel $url/openwrt-adm5120-rb1xx-kernel

 
 

-chmod +x /tmp/wget2nand-boot/kernel
+chmod +x /tmp/wget2nand-kernel/kernel

 
 # make sure everything is written before we unmount the partitions
 
 # make sure everything is written before we unmount the partitions

-echo "chmod ugo+x /" > /tmp/wget2nand/etc/uci-defaults/set_root_permission
+echo "chmod ugo+x /" > /tmp/wget2nand-rootfs/etc/uci-defaults/set_root_permission

 sync
 sync

-ls /tmp/wget2nand-boot/
-ls /tmp/wget2nand/
+ls /tmp/wget2nand-kernel/
+ls /tmp/wget2nand-rootfs/

 # unmount the partitions and remove the directories into which they were mounted
 # unmount the partitions and remove the directories into which they were mounted

-umount /tmp/wget2nand-boot
-umount /tmp/wget2nand
-rmdir /tmp/wget2nand-boot
-rmdir /tmp/wget2nand
+umount /tmp/wget2nand-kernel
+umount /tmp/wget2nand-rootfs
+rmdir /tmp/wget2nand-kernel
+rmdir /tmp/wget2nand-rootfs

 
 # all done
 echo "Image written, you can now reboot.  Remember to change the boot source to Boot from Nand"
 
 # all done
 echo "Image written, you can now reboot.  Remember to change the boot source to Boot from Nand"