OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 27... Line 27...
27 ;; 27 ;;
28 esac 28 esac
29 return 0; 29 return 0;
30 } 30 }
Line 31... Line -...
31   -  
32 zyxel_do_upgrade() { -  
33 local tar_file="$1" -  
34   -  
35 local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') -  
36 board_dir=${board_dir%/} -  
37   -  
38 tar Oxf $tar_file ${board_dir}/kernel | mtd write - kernel -  
39   -  
40 if [ "$SAVE_CONFIG" -eq 1 ]; then -  
41 tar Oxf $tar_file ${board_dir}/root | mtd -j "$CONF_TAR" write - rootfs -  
42 else -  
43 tar Oxf $tar_file ${board_dir}/root | mtd write - rootfs -  
44 fi -  
45 } -  
46   31  
47 platform_do_upgrade() { 32 platform_do_upgrade() {
48 case "$(board_name)" in 33 case "$(board_name)" in
49 8dev,jalapeno |\ -  
50 alfa-network,ap120c-ac |\ -  
51 avm,fritzbox-7530 |\ -  
52 qxwlan,e2600ac-c2) 34 8dev,jalapeno)
53 nand_do_upgrade "$ARGV" 35 nand_do_upgrade "$ARGV"
54 ;; -  
55 asus,map-ac2200) -  
56 CI_KERNPART="linux" -  
57 nand_do_upgrade "$1" -  
58 ;; 36 ;;
59 asus,rt-ac58u) 37 asus,rt-ac58u)
60 CI_UBIPART="UBI_DEV" 38 CI_UBIPART="UBI_DEV"
61 CI_KERNPART="linux" 39 CI_KERNPART="linux"
62 nand_do_upgrade "$1" 40 nand_do_upgrade "$1"
63 ;; -  
64 linksys,ea6350v3) -  
65 platform_do_upgrade_linksys "$ARGV" -  
66 ;; 41 ;;
67 openmesh,a42 |\ 42 openmesh,a42 |\
68 openmesh,a62) 43 openmesh,a62)
69 PART_NAME="inactive" 44 PART_NAME="inactive"
70 platform_do_upgrade_openmesh "$ARGV" 45 platform_do_upgrade_openmesh "$ARGV"
71 ;; 46 ;;
72 meraki,mr33) 47 meraki,mr33)
73 CI_KERNPART="part.safe" 48 CI_KERNPART="part.safe"
74 nand_do_upgrade "$1" 49 nand_do_upgrade "$1"
75 ;; -  
76 zyxel,nbg6617) -  
77 zyxel_do_upgrade "$1" -  
78 ;; 50 ;;
79 *) 51 *)
80 default_do_upgrade "$ARGV" 52 default_do_upgrade "$ARGV"
81 ;; 53 ;;
82 esac 54 esac
Line 83... Line 55...
83 } 55 }
84   56  
85 platform_nand_pre_upgrade() { -  
86 case "$(board_name)" in -  
87 alfa-network,ap120c-ac) -  
88 part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')" -  
89 if [ "$part" = "rootfs1" ]; then -  
90 fw_setenv active 2 || exit 1 -  
91 CI_UBIPART="rootfs2" -  
92 else -  
93 fw_setenv active 1 || exit 1 -  
94 CI_UBIPART="rootfs1" -  
95 fi 57 platform_nand_pre_upgrade() {
96 ;; 58 case "$(board_name)" in
97 asus,rt-ac58u) 59 asus,rt-ac58u)
98 CI_UBIPART="UBI_DEV" 60 CI_UBIPART="UBI_DEV"
99 CI_KERNPART="linux" 61 CI_KERNPART="linux"
100 ;; 62 ;;
101 meraki,mr33) 63 meraki,mr33)
102 CI_KERNPART="part.safe" 64 CI_KERNPART="part.safe"
103 ;; 65 ;;
-   66 esac
-   67 }
-   68  
-   69 blink_led() {
-   70 . /etc/diag.sh; set_state upgrade
-   71 }