OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 60... Line 60...
60 local rootfs="$(platform_get_rootfs)" 60 local rootfs="$(platform_get_rootfs)"
61 local kernel= 61 local kernel=
Line 62... Line 62...
62   62  
63 [ -b "${rootfs}" ] || return 1 63 [ -b "${rootfs}" ] || return 1
64 case "$board" in -  
65 er) -  
66 kernel=mmcblk0p1 -  
67 ;; 64 case "$board" in
68 erlite) 65 erlite)
69 kernel=sda1 66 kernel=sda1
-   67 ;;
-   68 er)
-   69 kernel=mmcblk0p1
70 ;; 70 ;;
71 *) 71 *)
72 return 1 72 return 1
Line 73... Line 73...
73 esac 73 esac
Line 80... Line 80...
80   80  
81 platform_check_image() { 81 platform_check_image() {
Line 82... Line 82...
82 local board=$(board_name) 82 local board=$(board_name)
83   83  
84 case "$board" in 84 case "$board" in
85 er | \ 85 erlite | \
86 erlite) 86 er)
87 local tar_file="$1" 87 local tar_file="$1"
88 local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null` 88 local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
89 local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null` 89 local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`
90 [ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && { 90 [ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && {
91 echo "The upgrade image is corrupt." 91 echo "The upgarde image is corrupt."
92 return 1 92 return 1
93 } 93 }
94 return 0 94 return 0