Merge r15272 to 8.09

SVN-Revision: 15273

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..9d0ea1d5fe8bdd788bb6759157aea1b1b87700b7 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,13 @@ add_route() {
                config_get gateway "$interface" gateway
        }
 
+       # handle "0.0.0.0" and "interface" 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" -o \
+               "$gateway" = "interface" ] && gateway=""
+
        dest="${netmask:+-net "$target" netmask "$netmask"}"
        dest="${dest:--host "$target"}"