Changeset 21593


Ignore:
Timestamp:
2010-05-28T02:47:23+02:00 (8 years ago)
Author:
jow
Message:

[backfire] merge r21588 and r21591

Location:
branches/backfire/package/base-files/files/etc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/base-files/files/etc/hotplug.d/net/10-net

    r21592 r21593  
    1212        # PPP devices are configured by pppd, no need to run setup_interface here 
    1313        case "$INTERFACE" in 
    14                 ppp*) return 0;; 
     14                ppp*|3g-*) return 0;; 
    1515                ath*) return 0;; 
    1616                wlan*) return 0;; 
  • branches/backfire/package/base-files/files/etc/init.d/network

    r21564 r21593  
    2424                config_get proto "$ifc" proto 
    2525 
    26                 type "coldplug_interface_$proto" >/dev/null && \ 
     26                local auto 
     27                config_get_bool auto "$ifc" auto 1 
     28 
     29                type "coldplug_interface_$proto" >/dev/null && [ "$auto" = 1 ] && \ 
    2730                        coldplug_interface_$proto "$ifc" 
    2831        done 
Note: See TracChangeset for help on using the changeset viewer.