[package] base-file: move alias setup to route hotplug, this fixes alias sections...

[openwrt/svn-archive/archive.git] / package / base-files / files / etc / hotplug.d / iface / 10-routes

diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes
index f871ca52883977b0b0d0091986241a72e218e6f9..118c1a665dafa60804c08fb4c0d1c7694b17ad29 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/iface/10-routes
+++ b/package/base-files/files/etc/hotplug.d/iface/10-routes
@@ -23,6 +23,12 @@ add_route() {
                config_get gateway "$interface" gateway
        }
 
+       # handle "0.0.0.0" as "no gateway given" to allow
+       # defining gateway-less routes while still keeping
+       # the possibility to have static routes with a
+       # proper gateway on interfaces with dynamic ips 
+       [ "$gateway" = "0.0.0.0" ] && gateway=""
+
        dest="${netmask:+-net "$target" netmask "$netmask"}"
        dest="${dest:--host "$target"}"
        
@@ -62,7 +68,35 @@ case "$ACTION" in
        ifup)
                include /lib/network
                scan_interfaces
+
+               # Setup aliases
+               config_set "$INTERFACE" aliases ""
+               config_set "$INTERFACE" alias_count 0
+               config_foreach setup_interface_alias alias "$INTERFACE" "$DEVICE"
+
+               # Save alias references in state vars
+               local aliases
+               config_get aliases "$INTERFACE" aliases
+               [ -z "$aliases" ] || uci_set_state network "$INTERFACE" aliases "$aliases"
+
+               # Make ip6addr of parent iface the main address again
+               local ip6addr
+               config_get ip6addr "$INTERFACE" ip6addr
+               [ -z "$ip6addr" ] || {
+                       ifconfig "$DEVICE" del "$ip6addr"
+                       ifconfig "$DEVICE" add "$ip6addr"
+               }
+
+               # Setup routes
                config_foreach "add_route" route
                config_foreach "add_route6" route6
        ;;
+       ifdown)
+               # Bring down named aliases
+               local ifn
+               for ifn in $(ifconfig | sed -ne "s/^\($DEVICE:[^[:space:]]\+\).*/\1/p"); do
+                       ifconfig "$ifn" down
+               done
+       ;;
 esac
+