diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-01-04 16:00:38 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-01-04 16:00:38 -0500 |
| commit | db18c076d609498aeca61e15b612c48351cc1c01 (patch) | |
| tree | 46d8fb36813d7f4f8800381b6d1afc79f97476ed /sysconfig/network-scripts | |
| parent | 328e7a968515028d5668a63e6f4851a9c8c7e4a3 (diff) | |
| download | initscripts-db18c076d609498aeca61e15b612c48351cc1c01.tar initscripts-db18c076d609498aeca61e15b612c48351cc1c01.tar.gz initscripts-db18c076d609498aeca61e15b612c48351cc1c01.tar.bz2 initscripts-db18c076d609498aeca61e15b612c48351cc1c01.tar.xz initscripts-db18c076d609498aeca61e15b612c48351cc1c01.zip | |
Frob device when calling sysctl, in case of vlans. (#665601, #667211, <ossman@cendio.se>)
Diffstat (limited to 'sysconfig/network-scripts')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-ipv6 | 6 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ipv6 | 8 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 1 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions-ipv6 | 6 |
5 files changed, 12 insertions, 11 deletions
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6 index e174ec90..9f04531a 100755 --- a/sysconfig/network-scripts/ifdown-ipv6 +++ b/sysconfig/network-scripts/ifdown-ipv6 @@ -64,9 +64,9 @@ if [ $? != 0 -a $? != 11 ]; then fi # Switch some sysctls to secure mode -/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.forwarding=0 >/dev/null 2>&1 -/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_ra=0 >/dev/null 2>&1 -/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_redirects=0 >/dev/null 2>&1 +/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.forwarding=0 >/dev/null 2>&1 +/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_ra=0 >/dev/null 2>&1 +/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_redirects=0 >/dev/null 2>&1 # Test status of tun6to4 device ipv6_test_device_status tun6to4 diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 326eba1a..7d165ca5 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -261,7 +261,7 @@ else fi if [ -n "$SRCADDR" ]; then - sysctl -w "net.ipv4.conf.${REALDEVICE}.arp_filter=1" >/dev/null 2>&1 + sysctl -w "net.ipv4.conf.${SYSCTLDEVICE}.arp_filter=1" >/dev/null 2>&1 fi # update ARP cache of neighboring computers diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6 index 29ba8af2..da1062ec 100755 --- a/sysconfig/network-scripts/ifup-ipv6 +++ b/sysconfig/network-scripts/ifup-ipv6 @@ -124,9 +124,9 @@ else ipv6_local_auto=0 fi fi -/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.forwarding=$ipv6_local_forwarding >/dev/null 2>&1 -/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_ra=$ipv6_local_auto >/dev/null 2>&1 -/sbin/sysctl -e -w net.ipv6.conf.$DEVICE.accept_redirects=$ipv6_local_auto >/dev/null 2>&1 +/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.forwarding=$ipv6_local_forwarding >/dev/null 2>&1 +/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_ra=$ipv6_local_auto >/dev/null 2>&1 +/sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_redirects=$ipv6_local_auto >/dev/null 2>&1 # Set IPv6 MTU, if given if [ -n "$IPV6_MTU" ]; then @@ -142,7 +142,7 @@ fi # Enable IPv6 RFC3041 privacy extensions if desired if [ "$IPV6_PRIVACY" = "rfc3041" ]; then - /sbin/sysctl -e -w net.ipv6.conf.$DEVICE.use_tempaddr=2 >/dev/null 2>&1 + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.use_tempaddr=2 >/dev/null 2>&1 if [ $? -ne 0 ]; then echo $"Cannot enable IPv6 privacy method '$IPV6_PRIVACY', not supported by kernel" fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 3b5695f7..562fe7cb 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -141,6 +141,7 @@ source_config () [ -z "$DEVICETYPE" ] && DEVICETYPE=$(echo ${DEVICE} | sed "s/[0-9]*$//") [ -z "$REALDEVICE" -a -n "$PARENTDEVICE" ] && REALDEVICE=$PARENTDEVICE [ -z "$REALDEVICE" ] && REALDEVICE=${DEVICE%%:*} + [ -z "$SYSCTLDEVICE" ] && SYSCTLDEVICE=${REALDEVICE/.//} if [ "${DEVICE}" != "${REALDEVICE}" ]; then ISALIAS=yes else diff --git a/sysconfig/network-scripts/network-functions-ipv6 b/sysconfig/network-scripts/network-functions-ipv6 index 6af9c8cb..24100cba 100644 --- a/sysconfig/network-scripts/network-functions-ipv6 +++ b/sysconfig/network-scripts/network-functions-ipv6 @@ -765,9 +765,9 @@ ipv6_add_tunnel_device() { fi # Set sysctls proper (regardless "default") - /sbin/sysctl -e -w net.ipv6.conf.$device.forwarding=1 >/dev/null 2>&1 - /sbin/sysctl -e -w net.ipv6.conf.$device.accept_ra=0 >/dev/null 2>&1 - /sbin/sysctl -e -w net.ipv6.conf.$device.accept_redirects=0 >/dev/null 2>&1 + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.forwarding=1 >/dev/null 2>&1 + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_ra=0 >/dev/null 2>&1 + /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_redirects=0 >/dev/null 2>&1 if [ -n "$addressipv6local" ]; then # Setup P-t-P address |