Changeset 27616


Ignore:
Timestamp:
2011-07-15T16:57:44+02:00 (7 years ago)
Author:
jow
Message:

[package] base-files: use uci_toggle_state() to prevent unwanted aggregation of state vars (#9711)

Location:
trunk/package/base-files
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/Makefile

    r27347 r27616  
    1111 
    1212PKG_NAME:=base-files 
    13 PKG_RELEASE:=73 
     13PKG_RELEASE:=74 
    1414 
    1515PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • trunk/package/base-files/files/etc/hotplug.d/iface/00-netstate

    r24212 r27616  
    11[ ifup = "$ACTION" ] && { 
    2         uci_set_state network "$INTERFACE" up 1  
    3         uci_set_state network "$INTERFACE" connect_time $(sed -ne 's![^0-9].*$!!p' /proc/uptime) 
    4         [ -n "$DEVICE" ] && uci_set_state network "$INTERFACE" ifname "$DEVICE" 
     2        uci_toggle_state network "$INTERFACE" up 1  
     3        uci_toggle_state network "$INTERFACE" connect_time $(sed -ne 's![^0-9].*$!!p' /proc/uptime) 
     4        [ -n "$DEVICE" ] && uci_toggle_state network "$INTERFACE" ifname "$DEVICE" 
    55} 
  • trunk/package/base-files/files/etc/hotplug.d/iface/10-routes

    r25713 r27616  
    8585                local aliases 
    8686                config_get aliases "$INTERFACE" aliases 
    87                 [ -z "$aliases" ] || uci_set_state network "$INTERFACE" aliases "$aliases" 
     87                [ -z "$aliases" ] || uci_toggle_state network "$INTERFACE" aliases "$aliases" 
    8888 
    8989                # Make ip6addr of parent iface the main address again 
  • trunk/package/base-files/files/lib/network/config.sh

    r27147 r27616  
    9797 
    9898        [ -n "$cfg" ] && { 
    99                 uci_set_state network "$cfg" dns "$add" 
    100                 uci_set_state network "$cfg" resolv_dns "$add" 
     99                uci_toggle_state network "$cfg" dns "$add" 
     100                uci_toggle_state network "$cfg" resolv_dns "$add" 
    101101        } 
    102102} 
     
    177177                                                append newdevs "$dev" 
    178178                                        done 
    179                                         uci_set_state network "$config" device "$newdevs" 
     179                                        uci_toggle_state network "$config" device "$newdevs" 
    180180                                        $DEBUG ifconfig "$iface" 0.0.0.0 
    181181                                        $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1 
     
    211211        local device 
    212212        config_get device "$1" device 
    213         uci_set_state network "$config" ifname "$ifname" 
    214         uci_set_state network "$config" device "$device" 
     213        uci_toggle_state network "$config" ifname "$ifname" 
     214        uci_toggle_state network "$config" device "$device" 
    215215} 
    216216 
Note: See TracChangeset for help on using the changeset viewer.