OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 162... Line 162...
162   162  
163 return 1 163 return 1
Line 164... Line 164...
164 } 164 }
165   165  
166 hex_le32_to_cpu() { 166 hex_le32_to_cpu() {
167 [ "$(echo 01 | hexdump -v -n 2 -e '/2 "%x"')" = "3031" ] && { 167 [ "$(echo 01 | hexdump -v -n 2 -e '/2 "%x"')" == "3031" ] && {
168 echo "${1:0:2}${1:8:2}${1:6:2}${1:4:2}${1:2:2}" 168 echo "${1:0:2}${1:8:2}${1:6:2}${1:4:2}${1:2:2}"
169 return 169 return
170 } 170 }
Line 209... Line 209...
209 # jffs2 209 # jffs2
210 mtd jffs2write "$CONF_TAR" rootfs 210 mtd jffs2write "$CONF_TAR" rootfs
211 fi 211 fi
212 } 212 }
Line 213... Line -...
213   -  
214 indicate_upgrade() { -  
215 . /etc/diag.sh -  
216 set_state upgrade -  
217 } -  
218   213  
219 # Flash firmware to MTD partition 214 # Flash firmware to MTD partition
220 # 215 #
221 # $(1): path to image 216 # $(1): path to image
222 # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m 217 # $(2): (optional) pipe command to extract firmware, e.g. dd bs=n skip=m
223 default_do_upgrade() { 218 default_do_upgrade() {
224 sync 219 sync
225 if [ "$SAVE_CONFIG" -eq 1 ]; then 220 if [ "$SAVE_CONFIG" -eq 1 ]; then
226 get_image "$1" "$2" | mtd $MTD_ARGS $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}" 221 get_image "$1" "$2" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}"
227 else 222 else
228 get_image "$1" "$2" | mtd $MTD_ARGS write - "${PART_NAME:-image}" 223 get_image "$1" "$2" | mtd write - "${PART_NAME:-image}"
229 fi -  
230 [ $? -ne 0 ] && exit 1 224 fi
Line 231... Line 225...
231 } 225 }
232   226  
233 do_upgrade_stage2() { 227 do_upgrade_stage2() {