aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-05-14 08:38:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-05-14 08:38:39 +0000
commit65dba323f79bfac2edb41724bcff03a3e9506ab8 (patch)
tree266f1aca6d0076b1194ca3f588007fc950e495d1
parent115f845e53df2ed428ef69c31d819a4f9dff9506 (diff)
downloadupstream-65dba323f79bfac2edb41724bcff03a3e9506ab8.tar.gz
upstream-65dba323f79bfac2edb41724bcff03a3e9506ab8.tar.bz2
upstream-65dba323f79bfac2edb41724bcff03a3e9506ab8.zip
ar71xx: Make wget2nand fail if copying the kernel fails and use the correct file extension for the rootfs image
wget2nand didnt check the exit status after copying the kernel, if the copying failed for some reason ( for example not enougs space on the kernel partition) it simply continued extracting the rootfs. I also changed the filename, which wget2nand trys to download ( .tar.gz instead of .tgz ). Signed-off-by: Marko Foerster <mrkfoerster@googlemail.com> SVN-Revision: 21444
-rwxr-xr-xtarget/linux/ar71xx/base-files/sbin/wget2nand7
1 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/ar71xx/base-files/sbin/wget2nand b/target/linux/ar71xx/base-files/sbin/wget2nand
index 99823be84c..171e3fa6db 100755
--- a/target/linux/ar71xx/base-files/sbin/wget2nand
+++ b/target/linux/ar71xx/base-files/sbin/wget2nand
@@ -28,7 +28,7 @@ url=$1
}
url_kernel=$url/openwrt-ar71xx-vmlinux.elf
-url_rootfs=$url/openwrt-ar71xx-rootfs.tgz
+url_rootfs=$url/openwrt-ar71xx-rootfs.tar.gz
mtd_kernel="$(find_mtd_part 'kernel')"
mtd_rootfs="$(find_mtd_part 'rootfs')"
@@ -60,7 +60,10 @@ mount -t yaffs2 "$mtd_kernel" "$mnt_kernel"
mount -t yaffs2 "$mtd_rootfs" "$mnt_rootfs"
echo "Copying kernel..."
-cp $src_kernel $mnt_kernel/kernel
+cp $src_kernel $mnt_kernel/kernel || {
+ echo "Error occured while copying the kernel"
+ exit 1
+}
chmod +x $mnt_kernel/kernel
echo "Preparing filesystem..."