diff options
Diffstat (limited to 'net-scripts/net.modules.d')
| -rw-r--r-- | net-scripts/net.modules.d/bridge.sh | 2 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/iptunnel.sh | 3 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/iwconfig.sh | 3 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/tuntap.sh | 4 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/udhcpc.sh | 5 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/wpa_supplicant.sh | 2 |
6 files changed, 17 insertions, 2 deletions
diff --git a/net-scripts/net.modules.d/bridge.sh b/net-scripts/net.modules.d/bridge.sh index cf6e605..67af002 100644 --- a/net-scripts/net.modules.d/bridge.sh +++ b/net-scripts/net.modules.d/bridge.sh @@ -136,6 +136,8 @@ bridge_pre_start() { iface="${!briface}" else ports="${!ports}" + # We are the bridge, so set our base metric to 1000. + metric=1000 fi # Create the bridge if needed diff --git a/net-scripts/net.modules.d/iptunnel.sh b/net-scripts/net.modules.d/iptunnel.sh index 860f9aa..3a3568d 100644 --- a/net-scripts/net.modules.d/iptunnel.sh +++ b/net-scripts/net.modules.d/iptunnel.sh @@ -27,6 +27,9 @@ iptunnel_pre_start() { eval opts="iptunnel_${ifvar}" [[ -z ${!opts} ]] && return 0 + # Set our base metric to 1000 + metric=1000 + ebegin "Creating tunnel ${iface}" interface_tunnel add "${iface}" ${!opts} eend "$?" diff --git a/net-scripts/net.modules.d/iwconfig.sh b/net-scripts/net.modules.d/iwconfig.sh index f19afb2..6cca973 100644 --- a/net-scripts/net.modules.d/iwconfig.sh +++ b/net-scripts/net.modules.d/iwconfig.sh @@ -898,6 +898,9 @@ iwconfig_pre_start() { return 0 fi + # Set the base metric to be 2000 + metric=2000 + # Check for rf_kill - only ipw supports this at present, but other # cards may in the future. if [[ -e "/sys/class/net/${iface}/device/rf_kill" ]]; then diff --git a/net-scripts/net.modules.d/tuntap.sh b/net-scripts/net.modules.d/tuntap.sh index dc40523..597cb12 100644 --- a/net-scripts/net.modules.d/tuntap.sh +++ b/net-scripts/net.modules.d/tuntap.sh @@ -62,6 +62,10 @@ tuntap_pre_start() { tuntap_check_kernel || return 1 ebegin "Creating Tun/Tap interface ${iface}" + + # Set the base metric to 1000 + metric=1000 + if [[ -x /usr/sbin/openvpn ]] ; then openvpn --mktun --dev-type "${!tuntap}" --dev "${iface}" \ > /dev/null diff --git a/net-scripts/net.modules.d/udhcpc.sh b/net-scripts/net.modules.d/udhcpc.sh index 3c646fe..07ab6cf 100644 --- a/net-scripts/net.modules.d/udhcpc.sh +++ b/net-scripts/net.modules.d/udhcpc.sh @@ -128,8 +128,9 @@ udhcpc_start() { eval start-stop-daemon --start --exec /sbin/udhcpc \ --pidfile "${pidfile}" \ - -- "${opts}" --interface="${iface}" --now --quiet \ - --pidfile="${pidfile}" + -- "${opts}" --interface="${iface}" --now \ + --script=/lib/rcscripts/sh/udhcpc.sh \ + --pidfile="${pidfile}" >/dev/null eend $? || return 1 # DHCP succeeded, show address retrieved diff --git a/net-scripts/net.modules.d/wpa_supplicant.sh b/net-scripts/net.modules.d/wpa_supplicant.sh index f2357bd..a9e99c0 100644 --- a/net-scripts/net.modules.d/wpa_supplicant.sh +++ b/net-scripts/net.modules.d/wpa_supplicant.sh @@ -203,6 +203,7 @@ wpa_supplicant_pre_start() { ESSID="$( wpa_supplicant_get_essid "${iface}" )" ESSIDVAR="$( bash_variable "${ESSID}" )" save_options "ESSID" "${ESSID}" + metric=2000 fi return 0 fi @@ -349,6 +350,7 @@ wpa_supplicant_pre_start() { exit 0 fi + metric=2000 return 0 } |