diff options
Diffstat (limited to 'source/n/network-scripts')
| -rwxr-xr-x | source/n/network-scripts/network-scripts.SlackBuild | 6 | ||||
| -rw-r--r-- | source/n/network-scripts/scripts/netconfig | 6 | ||||
| -rw-r--r-- | source/n/network-scripts/scripts/rc.inet1.conf | 2 | ||||
| -rw-r--r-- | source/n/network-scripts/scripts/rc.ip_forward | 22 |
4 files changed, 29 insertions, 7 deletions
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild index 78aa577e6..7b4b06e0d 100755 --- a/source/n/network-scripts/network-scripts.SlackBuild +++ b/source/n/network-scripts/network-scripts.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ PKGNAM=network-scripts -VERSION=${VERSION:-14.00} +VERSION=${VERSION:-14.1} ARCH=noarch -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/n/network-scripts/scripts/netconfig b/source/n/network-scripts/scripts/netconfig index 1e1151484..3bd483dea 100644 --- a/source/n/network-scripts/scripts/netconfig +++ b/source/n/network-scripts/scripts/netconfig @@ -101,12 +101,12 @@ DEBUG_ETH_UP="no" ## Some examples of additional network parameters that you can use. ## Config information for wlan0: -#IFNAME[4]="wlan0" # Use a different interface name nstead of +#IFNAME[4]="wlan0" # Use a different interface name instead of # the default 'eth4' #HWADDR[4]="00:01:23:45:67:89" # Overrule the card's hardware MAC address #MTU[4]="" # The default MTU is 1500, but you might need # 1360 when you use NAT'ed IPSec traffic. -#DHCP_KEEPRESOLV[4]="yes" # If you dont want /etc/resolv.conf overwritten +#DHCP_KEEPRESOLV[4]="yes" # If you don't want /etc/resolv.conf overwritten #DHCP_KEEPNTP[4]="yes" # If you don't want ntp.conf overwritten #DHCP_KEEPGW[4]="yes" # If you don't want the DHCP server to change # your default gateway @@ -326,7 +326,7 @@ if [ -w etc/NetworkManager/NetworkManager.conf ]; then sed -i "s/^hostname=.*$/hostname=$HOSTNM/g" etc/NetworkManager/NetworkManager.conf fi -dialog --title "CONFIGUATION TYPE FOR '$HOSTNM.$DOMAIN'" \ +dialog --title "CONFIGURATION TYPE FOR '$HOSTNM.$DOMAIN'" \ --default-item DHCP \ --menu \ "Now we need to know how your machine connects to the network.\n\ diff --git a/source/n/network-scripts/scripts/rc.inet1.conf b/source/n/network-scripts/scripts/rc.inet1.conf index d3798d8bf..85a8041ba 100644 --- a/source/n/network-scripts/scripts/rc.inet1.conf +++ b/source/n/network-scripts/scripts/rc.inet1.conf @@ -87,7 +87,7 @@ DEBUG_ETH_UP="no" #DHCP_TIMEOUT[4]=15 # The default timeout for the DHCP client to # wait for server resonse is 10 seconds, but # you might want a shorter or longer wait. -#DHCP_KEEPRESOLV[4]="yes" # If you dont want /etc/resolv.conf overwritten +#DHCP_KEEPRESOLV[4]="yes" # If you don't want /etc/resolv.conf overwritten #DHCP_KEEPNTP[4]="yes" # If you don't want ntp.conf overwritten #DHCP_KEEPGW[4]="yes" # If you don't want the DHCP server to change # your default gateway diff --git a/source/n/network-scripts/scripts/rc.ip_forward b/source/n/network-scripts/scripts/rc.ip_forward index 8940dc2cc..1fa6b57cd 100644 --- a/source/n/network-scripts/scripts/rc.ip_forward +++ b/source/n/network-scripts/scripts/rc.ip_forward @@ -24,6 +24,17 @@ ip_forward_start() { /bin/grep ipv4 /etc/sysctl.conf | sysctl -p - 1> /dev/null 2> /dev/null fi fi + if [ -f /proc/sys/net/ipv6/conf/all/forwarding ]; then + echo "Activating IPv6 packet forwarding." + echo 1 > /proc/sys/net/ipv6/conf/all/forwarding + # Changing /proc/sys/net/ipv6/conf/all/forwarding results in resetting + # all non-default ipv6 parameters for the interface as mentioned in + # /usr/src/linux/Documentation/networking/ip-sysctl.txt. So, we + # will reapply any ipv6 sysctl parameters now: + if [ -r /etc/sysctl.conf ]; then + /bin/grep ipv6 /etc/sysctl.conf | sysctl -p - 1> /dev/null 2> /dev/null + fi + fi # When using IPv4 packet forwarding, you will also get the # rp_filter, which automatically rejects incoming packets if the # routing table entry for their source address doesn't match the @@ -53,6 +64,17 @@ ip_forward_stop() { /bin/grep ipv4 /etc/sysctl.conf | sysctl -p - 1> /dev/null 2> /dev/null fi fi + if [ -f /proc/sys/net/ipv6/conf/all/forwarding ]; then + echo "Disabling IPv6 packet forwarding." + echo 0 > /proc/sys/net/ipv6/conf/all/forwarding + # Changing /proc/sys/net/ipv6/conf/all/forwarding results in resetting + # all non-default ipv6 parameters for the interface as mentioned in + # /usr/src/linux/Documentation/networking/ip-sysctl.txt. So, we + # will reapply any ipv6 sysctl parameters now: + if [ -r /etc/sysctl.conf ]; then + /bin/grep ipv6 /etc/sysctl.conf | sysctl -p - 1> /dev/null 2> /dev/null + fi + fi } # Restart IP packet forwarding: |