OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 13... Line 13...
13 set network.loopback='interface' 13 set network.loopback='interface'
14 set network.loopback.ifname='lo' 14 set network.loopback.ifname='lo'
15 set network.loopback.proto='static' 15 set network.loopback.proto='static'
16 set network.loopback.ipaddr='127.0.0.1' 16 set network.loopback.ipaddr='127.0.0.1'
17 set network.loopback.netmask='255.0.0.0' 17 set network.loopback.netmask='255.0.0.0'
-   18 delete network.globals
-   19 set network.globals='globals'
-   20 set network.globals.ula_prefix='auto'
18 EOF 21 EOF
19 [ -e /proc/sys/net/ipv6 ] && { -  
20 uci -q batch <<-EOF -  
21 delete network.globals -  
22 set network.globals='globals' -  
23 set network.globals.ula_prefix='auto' -  
24 EOF -  
25 } -  
Line 26... Line 22...
26   22  
27 if json_is_a dsl object; then 23 if json_is_a dsl object; then
28 json_select dsl 24 json_select dsl
29 if json_is_a atmbridge object; then 25 if json_is_a atmbridge object; then
Line 104... Line 100...
104   100  
105 uci -q batch <<-EOF 101 uci -q batch <<-EOF
106 set network.$1.proto='static' 102 set network.$1.proto='static'
107 set network.$1.ipaddr='$ipad' 103 set network.$1.ipaddr='$ipad'
-   104 set network.$1.netmask='$netm'
108 set network.$1.netmask='$netm' 105 set network.$1.ip6assign='60'
109 EOF -  
110 [ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60' 106 EOF
Line 111... Line 107...
111 ;; 107 ;;
112   108  
113 dhcp) 109 dhcp)
Line 114... Line -...
114 # fixup IPv6 slave interface if parent is a bridge -  
115 [ "$type" = "bridge" ] && ifname="br-$1" -  
116   110 # fixup IPv6 slave interface if parent is a bridge
-   111 [ "$type" = "bridge" ] && ifname="br-$1"
117 uci set network.$1.proto='dhcp' 112  
118 [ -e /proc/sys/net/ipv6 ] && { 113 uci -q batch <<-EOF
119 uci -q batch <<-EOF 114 set network.$1.proto='dhcp'
120 delete network.${1}6 115 delete network.${1}6
121 set network.${1}6='interface' 116 set network.${1}6='interface'
122 set network.${1}6.ifname='$ifname' -  
123 set network.${1}6.proto='dhcpv6' 117 set network.${1}6.ifname='$ifname'
Line 124... Line 118...
124 EOF 118 set network.${1}6.proto='dhcpv6'
125 } 119 EOF
126 ;; 120 ;;
127   121  
128 pppoe) 122 pppoe)
-   123 uci -q batch <<-EOF
-   124 set network.$1.proto='pppoe'
-   125 set network.$1.username='username'
-   126 set network.$1.password='password'
-   127 set network.$1.ipv6='1'
129 uci -q batch <<-EOF 128 delete network.${1}6
130 set network.$1.proto='pppoe' -  
131 set network.$1.username='username' -  
132 set network.$1.password='password' -  
133 EOF -  
134 [ -e /proc/sys/net/ipv6 ] && { -  
135 uci -q batch <<-EOF -  
136 set network.$1.ipv6='1' -  
137 delete network.${1}6 -  
138 set network.${1}6='interface' -  
139 set network.${1}6.ifname='@${1}' 129 set network.${1}6='interface'
140 set network.${1}6.proto='dhcpv6' 130 set network.${1}6.ifname='@${1}'
141 EOF 131 set network.${1}6.proto='dhcpv6'
Line 142... Line 132...
142 } 132 EOF
Line 364... Line 354...
364 set system.$cfg.factor='$factor' 354 set system.$cfg.factor='$factor'
365 EOF 355 EOF
366 ;; 356 ;;
Line 367... Line 357...
367   357  
368 switch) 358 switch)
369 local port_mask speed_mask mode 359 local port_mask speed_mask
370 json_get_vars port_mask speed_mask mode 360 json_get_vars port_mask speed_mask
371 uci -q batch <<-EOF 361 uci -q batch <<-EOF
372 set system.$cfg.port_mask='$port_mask' 362 set system.$cfg.port_mask='$port_mask'
373 set system.$cfg.speed_mask='$speed_mask' -  
374 set system.$cfg.mode='$mode' 363 set system.$cfg.speed_mask='$speed_mask'
375 EOF 364 EOF
Line 376... Line 365...
376 ;; 365 ;;
377   366