Changeset 47750
- Timestamp:
- 2015-12-04T10:56:55+01:00 (2 years ago)
- Location:
- trunk/package/base-files/files
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/package/base-files/files/bin/config_generate
r47732 r47750 19 19 set network.globals.ula_prefix='auto' 20 20 EOF 21 22 if json_is_a dsl object; then 23 json_select dsl 24 if json_is_a atmbridge object; then 25 json_select atmbridge 26 local vpi vci encaps payload 27 json_get_vars vpi vci encaps payload 28 uci -q batch <<-EOF 29 delete network.atm 30 set network.atm='atm-bridge' 31 set network.atm.vpi='$vpi' 32 set network.atm.vci='$vci' 33 set network.atm.encaps='$encaps' 34 set network.atm.payload='$payload' 35 EOF 36 json_select .. 37 fi 38 39 if json_is_a modem object; then 40 json_select modem 41 local type annex firmware tone xfer_mode 42 json_get_vars type annex firmware tone xfer_mode 43 uci -q batch <<-EOF 44 delete network.dsl 45 set network.dsl='$type' 46 set network.dsl.annex='$annex' 47 set network.dsl.firmware='$firmware' 48 set network.dsl.tone='$tone' 49 set network.dsl.xfer_mode='$xfer_mode' 50 EOF 51 json_select .. 52 fi 53 json_select .. 54 fi 21 55 } 22 56 … … 69 103 uci -q batch <<-EOF 70 104 set network.$1.proto='dhcp' 105 delete network.${1}6 106 set network.${1}6='interface' 107 set network.${1}6.ifname='$ifname' 108 set network.${1}6.proto='dhcpv6' 109 EOF 110 ;; 111 112 pppoe) 113 # fixup IPv6 slave interface 114 ifname="pppoe-$1" 115 116 uci -q batch <<-EOF 117 set network.$1.proto='pppoe' 118 set network.$1.username='username' 119 set network.$1.password='password' 120 set network.$1.ipv6='auto' 71 121 delete network.${1}6 72 122 set network.${1}6='interface' -
trunk/package/base-files/files/lib/functions/uci-defaults-new.sh
r47744 r47750 40 40 if ! json_is_a protocol string; then 41 41 case "$proto" in 42 static|dhcp|none ) : ;;42 static|dhcp|none|pppoe) : ;; 43 43 *) 44 44 case "$name" in … … 305 305 } 306 306 307 ucidef_add_atm_bridge() { 308 local vpi="$1" 309 local vci="$2" 310 local encaps="$3" 311 local payload="$4" 312 313 json_select_object dsl 314 json_select_object atmbridge 315 json_add_int vpi "$vpi" 316 json_add_int vci "$vci" 317 json_add_string encaps "$encaps" 318 json_add_string payload "$payload" 319 json_select .. 320 json_select .. 321 } 322 323 ucidef_add_adsl_modem() { 324 local annex="$1" 325 local firmware="$2" 326 327 json_select_object dsl 328 json_select_object modem 329 json_add_string type "adsl" 330 json_add_string annex "$annex" 331 json_add_string firmware "$firmware" 332 json_select .. 333 json_select .. 334 } 335 336 ucidef_add_vdsl_modem() { 337 local annex="$1" 338 local firmware="$2" 339 local tone="$3" 340 local xfer_mode="$4" 341 342 json_select_object dsl 343 json_select_object modem 344 json_add_string type "vdsl" 345 json_add_string annex "$annex" 346 json_add_string firmware "$firmware" 347 json_add_string tone "$tone" 348 json_add_string xfer_mode "$xfer_mode" 349 json_select .. 350 json_select .. 351 } 352 307 353 ucidef_set_led_netdev() { 308 354 local cfg="led_$1"
Note: See TracChangeset
for help on using the changeset viewer.