From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 14 May 2010 08:38:39 +0000 (+0000)
Subject: ar71xx: Make wget2nand fail if copying the kernel fails and use the correct file... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/0ba3851aa6b4eb47b0c040692f7e126b27b26a92

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>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21444 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/ar71xx/base-files/sbin/wget2nand b/target/linux/ar71xx/base-files/sbin/wget2nand
index 99823be84..171e3fa6d 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..."