projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: add AR933x specific USB setup function
[openwrt.git]
/
target
/
linux
/
ar71xx
/
base-files
/
sbin
/
wget2nand
diff --git
a/target/linux/ar71xx/base-files/sbin/wget2nand
b/target/linux/ar71xx/base-files/sbin/wget2nand
index
3ab24a6
..
9cd6e7c
100755
(executable)
--- a/
target/linux/ar71xx/base-files/sbin/wget2nand
+++ b/
target/linux/ar71xx/base-files/sbin/wget2nand
@@
-8,13
+8,14
@@
# Based on cf2nand from RB532 support
. /etc/functions.sh
# Based on cf2nand from RB532 support
. /etc/functions.sh
-[ -d /tmp/wget2nand-rootfs ] && {
- echo "/tmp/wget2nand-rootfs already exists"
- exit 1
-}
+wget2nand_dir=/tmp/wget2nand
+mnt_kernel=$wget2nand_dir/mnt_kernel
+mnt_rootfs=$wget2nand_dir/mnt_rootfs
+src_rootfs=$wget2nand_dir/rootfs.tgz
+src_kernel=$wget2nand_dir/kernel
-[ -d
/tmp/wget2nand-kernel
] && {
- echo "
/tmp/wget2nand-kernel
already exists"
+[ -d
"$wget2nand_dir"
] && {
+ echo "
$wget2nand_dir
already exists"
exit 1
}
exit 1
}
@@
-26,9
+27,8
@@
url=$1
exit 1
}
exit 1
}
-# first get an address for br-lan using udhcpc
-killall udhcpc
-/sbin/udhcpc -i br-lan
+url_kernel=$url/openwrt-ar71xx-nand-vmlinux.elf
+url_rootfs=$url/openwrt-ar71xx-nand-rootfs.tar.gz
mtd_kernel="$(find_mtd_part 'kernel')"
mtd_rootfs="$(find_mtd_part 'rootfs')"
mtd_kernel="$(find_mtd_part 'kernel')"
mtd_rootfs="$(find_mtd_part 'rootfs')"
@@
-37,37
+37,49
@@
mtd_rootfs="$(find_mtd_part 'rootfs')"
exit 1
}
exit 1
}
+mkdir "$wget2nand_dir"
+wget $url_kernel -O "$src_kernel" || {
+ echo "Unable to download $url_kernel"
+ exit 1
+}
+
+wget $url_rootfs -O "$src_rootfs" || {
+ echo "Unable to download $url_rootfs"
+ exit 1
+}
+
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 "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"
-mkdir /tmp/wget2nand-rootfs
-mkdir /tmp/wget2nand-kernel
-mount -t yaffs2 "$mtd_rootfs" /tmp/wget2nand-rootfs
-mount -t yaffs2 "$mtd_kernel" /tmp/wget2nand-kernel
-
-echo "Erasing existing files..."
-rm -rf /tmp/wget2nand-rootfs/*
+mkdir "$mnt_kernel"
+mkdir "$mnt_rootfs"
+mount -t yaffs2 "$mtd_kernel" "$mnt_kernel"
+mount -t yaffs2 "$mtd_rootfs" "$mnt_rootfs"
-echo "Copying filesystem..."
-( wget -O - $url/openwrt-ar71xx-rootfs.tgz) | ( cd /tmp/wget2nand-rootfs/; tar xvz )
-# RouterBOOT is looking for a kernel named "kernel"
-wget -O /tmp/wget2nand-kernel/kernel $url/openwrt-ar71xx-vmlinux.elf
+echo "Copying kernel..."
+cp $src_kernel $mnt_kernel/kernel || {
+ echo "Error occured while copying the kernel"
+ exit 1
+}
+chmod +x $mnt_kernel/kernel
-chmod +x /tmp/wget2nand-kernel/kernel
+echo "Preparing filesystem..."
+( cd "$mnt_rootfs"; tar xvz -f "$src_rootfs" )
# 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-
rootfs/etc/uci-defaults/set_root_permission
+echo "chmod ugo+x /" >
$mnt_
rootfs/etc/uci-defaults/set_root_permission
sync
sync
-ls /tmp/wget2nand-kernel/
-ls /tmp/wget2nand-rootfs/
+ls $mnt_kernel >/dev/null
+ls $mnt_rootfs >/dev/null
+
+echo "Cleaning up..."
# 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-kernel
-umount /tmp/wget2nand-rootfs
-rmdir /tmp/wget2nand-kernel
-rmdir /tmp/wget2nand-rootfs
+umount $mnt_kernel
+umount $mnt_rootfs
+rm -rf $wget2nand_dir
# 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"
This page took
0.022596 seconds
and
4
git commands to generate.