- merged changes from PLD, all TLD changes and fixes are kept

[rc-scripts.git] / lib / functions.network

diff --git a/lib/functions.network b/lib/functions.network
index a68ed7621fa11b0f9cedd0e13c21d3666c4b4061..d151b04ecc567879b896fea3eaae1cb4dd6fd9e0 100644 (file)
--- a/lib/functions.network
+++ b/lib/functions.network
@@ -232,11 +232,11 @@ setup_ip_param ()
        esac
 
        # Multicast ready devices
-       if is_yes "$MULTICAST"; then
-               MULTICAST="on"
+       if [ -n "$MULTICAST" ]; then
+               MULTICAST="$MULTICAST"
        else
                case "$DEVICETYPE" in
-                 eth|br)
+                 eth|br|vlan)
                        MULTICAST="on"
                        ;;
                  *)
@@ -299,6 +299,7 @@ setup_ip_gw_ro ()
                if [ -z "${IPV6_GLOBALROUTEDEV}" -o "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
                        # set up default route
                        if [ "${IPV6_GLOBALROUTEGW}" ]; then
+                               ip -6 route add ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
                                ip -6 route add 2000::/3 via ${IPV6_GLOBALROUTEGW} dev ${DEVICE} ${IP6SRCADDR} onlink
                        elif [ "${IPV6_GLOBALROUTEDEV}" = "${DEVICE}" ]; then
                                ip -6 route add 2000::/3 dev ${DEVICE} ${IP6SRCADDR}