18 files changed, 45 insertions, 92 deletions
diff --git a/initscripts.spec b/initscripts.spec
index de0e2ef7..5d4558fe 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -201,9 +201,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 - fix ifup-post when lookup fails (#220318, <hiroshi.fujishima+redhat@gmail.com>)
-
 - add bridging docs (#221412, <markmc@redhat.com>)
 - release bonding slaves properly (#220525)
+- remove NETWORKING_IPV6; to disable, use a modprobe rule
 
 * Tue Dec 19 2006 Bill Nottingham <notting@redhat.com> 8.49-1
 - rc.sysinit: remove raidautorn (#219226)
diff --git a/ipv6-6to4.howto b/ipv6-6to4.howto
index f3b43626..a40b6191 100644
--- a/ipv6-6to4.howto
+++ b/ipv6-6to4.howto
@@ -57,7 +57,6 @@ Now, set up the configuration as follows:
 1. Enable IPv6 and set 6to4 pseudo-interface as default gateway in 
    /etc/sysconfig/network:
 
-   echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
    echo "IPV6_DEFAULTDEV=tun6to4">> /etc/sysconfig/network
 
 2. Edit your outbound (Internet) interface configuration.  This can be 
@@ -172,3 +171,21 @@ Routers") is the RFC about finding a close 6to4 relay automatically.
 http://www.ietf.org/internet-drafts/draft-savola-v6ops-6to4-security-02.txt
 ("Security Considerations and Enhancements for 6to4") explains some
 security considerations in 6to4.
+ipv6-tunnel.howto
+ppp/ip-up.ipv6to4
+ppp/ip-down.ipv6to4
+ppp/ipv6-up
+ppp/ipv6-down
+rc.d/init.d/network
+rc.d/init.d/network.orig
+sysconfig/network-scripts/ifdown-eth
+sysconfig/network-scripts/ifup-ippp
+sysconfig/network-scripts/ifup-ipv6
+sysconfig/network-scripts/ifdown-ipv6
+sysconfig/network-scripts/init.ipv6-global
+sysconfig/network-scripts/ifup-eth
+sysconfig/network-scripts/ifup-eth.rej
+sysconfig/network-scripts/ifdown-ippp
+sysconfig/network-scripts/ifdown-sit
+sysconfig/network-scripts/ifup-sit
+sysconfig.txt
diff --git a/ipv6-tunnel.howto b/ipv6-tunnel.howto
index dd83742f..19646363 100644
--- a/ipv6-tunnel.howto
+++ b/ipv6-tunnel.howto
@@ -56,7 +56,6 @@ Now, set up the configuration as follows:
 
 1. Enable IPv6 and set tunnel as default gateway in /etc/sysconfig/network:
 
-   echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
    echo "IPV6_DEFAULTDEV=sit1">> /etc/sysconfig/network
 
 2. Create /etc/sysconfig/network-scripts/ifcfg-sit1, with the following:
diff --git a/ppp/ip-down.ipv6to4 b/ppp/ip-down.ipv6to4
index 1fe3e086..93e0d91d 100644
--- a/ppp/ip-down.ipv6to4
+++ b/ppp/ip-down.ipv6to4
@@ -21,9 +21,6 @@
 #        was set before by using "ip-up.ipv6to4" comparing IPv4 address
 #        of device with the generated 6to4 prefix
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  IPV6TO4INIT=yes|no: controls configuration
 #  IPV6TO4_ROUTING="<device>-<suffix>/<prefix length> ...": information to setup additional interfaces
@@ -54,9 +51,6 @@ source_config
 REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 [ "$DEVICE" != "$REALDEVICE" ] && exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "$NETWORKING_IPV6" = "yes" ] || exit 0
-
 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then
 	exit 1
 fi
diff --git a/ppp/ip-up.ipv6to4 b/ppp/ip-up.ipv6to4
index 0491ce7e..e06cc246 100644
--- a/ppp/ip-up.ipv6to4
+++ b/ppp/ip-up.ipv6to4
@@ -20,9 +20,6 @@
 # Note: this script will *kill* older still existing 6to4 tunnels regardless
 #        whether they were set before by another device
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  IPV6TO4INIT=yes|no: controls configuration
 #  IPV6TO4_IPV4ADDR=<IPv4 address>: special local address for 6to4 tunneling (only needed behind a NAT gateway)
@@ -60,9 +57,6 @@ source_config
 REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 [ "$DEVICE" != "$REALDEVICE" ] && exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "$NETWORKING_IPV6" = "yes" ] || exit 0
-
 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then
         exit 1
 fi
diff --git a/ppp/ipv6-down b/ppp/ipv6-down
index bc960483..b290585a 100644
--- a/ppp/ipv6-down
+++ b/ppp/ipv6-down
@@ -22,9 +22,6 @@
 #
 # Version 2006-08-02
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  IPV6INIT=yes|no: controls IPv6 configuration for this interface
 #
@@ -46,9 +43,6 @@ CONFIG=$LOGDEVICE
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/ppp/ipv6-up b/ppp/ipv6-up
index 2fe075d9..92588b98 100644
--- a/ppp/ipv6-up
+++ b/ppp/ipv6-up
@@ -23,7 +23,6 @@
 # Version: 2006-08-02
 #
 # Uses following information from "/etc/sysconfig/network":
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
 #  IPV6_DEFAULTDEV=<device>: controls default route (optional)
 #
 # Uses following information from "/etc/sysconfig/network-scripts/ifcfg-$1":
@@ -54,9 +53,6 @@ source_config
 # Test whether IPv6 configuration is enabled for this interface, else stop
 [ "$IPV6INIT" = "yes" ] || exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index c49928c2..06165fe7 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -54,10 +54,8 @@ interfaces=$(ls ifcfg* | \
 case "$1" in
   start)
 	# IPv6 hook (pre IPv4 start)
-	if [ "$NETWORKING_IPV6" = "yes" ]; then
-		if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
-			/etc/sysconfig/network-scripts/init.ipv6-global start pre
-		fi
+	if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
+		/etc/sysconfig/network-scripts/init.ipv6-global start pre
 	fi
   
 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
@@ -156,10 +154,8 @@ case "$1" in
 	fi    
 
  	# IPv6 hook (post IPv4 start)
- 	if [ "$NETWORKING_IPV6" = "yes" ]; then
- 		if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
- 			/etc/sysconfig/network-scripts/init.ipv6-global start post
- 		fi
+ 	if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
+ 		/etc/sysconfig/network-scripts/init.ipv6-global start post
  	fi
 	# Run this again to catch any interface-specific actions
 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
@@ -190,10 +186,8 @@ case "$1" in
 	fi
 	
  	# IPv6 hook (pre IPv4 stop)
- 	if [ "$NETWORKING_IPV6" = "yes" ]; then
- 		if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
- 			/etc/sysconfig/network-scripts/init.ipv6-global stop pre
- 		fi
+ 	if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
+ 		/etc/sysconfig/network-scripts/init.ipv6-global stop pre
  	fi
  
 	vlaninterfaces=""
@@ -264,10 +258,8 @@ case "$1" in
 	fi
 
 	# IPv6 hook (post IPv4 stop)
-	if [ "$NETWORKING_IPV6" = "yes" ]; then
-		if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
-			/etc/sysconfig/network-scripts/init.ipv6-global stop post
-		fi
+	if [ -x /etc/sysconfig/network-scripts/init.ipv6-global ]; then
+		/etc/sysconfig/network-scripts/init.ipv6-global stop post
 	fi
 	
         rm -f /var/lock/subsys/network
diff --git a/sysconfig.txt b/sysconfig.txt
index f6903101..a4d830c1 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -192,9 +192,6 @@ Files in /etc/sysconfig
     network has spanning tree running and must wait for STP convergence.
     Default: 0 (no delay)
 
-  NETWORKING_IPV6=yes|no
-    Enable or disable global IPv6 initialization
-    Default: no
   IPV6FORWARDING=yes|no
     Enable or disable global forwarding of incoming IPv6 packets 
     on all interfaces.
@@ -274,6 +271,10 @@ Files in /etc/sysconfig
       a bad idea otherwise. This setting was moved into
       net.ipv4.ip_always_defrag setting in /etc/sysctl.conf. It
       is no longer valid for 2.4 kernels.
+    NETWORKING_IPV6=yes|no
+      Enable or disable global IPv6 initialization
+      
+      To do this properly, add a rule in /etc/modprobe.conf.
 
 /etc/sysconfig/static-routes-ipv6:
   Contains lines of the form:
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index c0de20e5..c987d346 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -60,13 +60,11 @@ if is_bonding_device ${DEVICE} ; then
 
 fi
 
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifdown-ipv6 ${CONFIG}
-    if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -f /var/run/dhcp6c_${DEVICE}.pid ]; then
-       kill `cat /var/run/dhcp6c_${DEVICE}.pid`;
-       rm -f /var/run/dhcp6c_${DEVICE}.pid;
-    fi;	
-fi;
+/etc/sysconfig/network-scripts/ifdown-ipv6 ${CONFIG}
+if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -f /var/run/dhcp6c_${DEVICE}.pid ]; then
+	kill `cat /var/run/dhcp6c_${DEVICE}.pid`;
+	rm -f /var/run/dhcp6c_${DEVICE}.pid;
+fi
 
 retcode=0
 [ -n "`pidof -x dhclient`" ] && {
diff --git a/sysconfig/network-scripts/ifdown-ippp b/sysconfig/network-scripts/ifdown-ippp
index 07f11053..54847cd4 100755
--- a/sysconfig/network-scripts/ifdown-ippp
+++ b/sysconfig/network-scripts/ifdown-ippp
@@ -16,9 +16,7 @@ if [ -f /var/lock/subsys/ibod ] ; then
 fi
 
 # Shut down IPv6
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifdown-ipv6 $CONFIG
-fi
+/etc/sysconfig/network-scripts/ifdown-ipv6 $CONFIG
 
 # shutdown isdn device
 isdnctrl hangup $DEVICE >/dev/null 2>&1
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
index 2872aa29..2d14b6b9 100755
--- a/sysconfig/network-scripts/ifdown-ipv6
+++ b/sysconfig/network-scripts/ifdown-ipv6
@@ -16,9 +16,6 @@
 # Note: if called as (like normally) by /etc/sysconfig/network-scripts/ifdown
 #        exit codes aren't handled by "ifdown"
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  DEVICE=<device>
 #  IPV6INIT=yes|no: controls IPv6 configuration for this interface
@@ -52,9 +49,6 @@ source_config
 REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 [ "$DEVICE" != "$REALDEVICE" ] && exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit
index 89d26677..20be7fa0 100755
--- a/sysconfig/network-scripts/ifdown-sit
+++ b/sysconfig/network-scripts/ifdown-sit
@@ -13,9 +13,6 @@
 #
 # Version 2002-11-01
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  DEVICE=<device>
 #
@@ -34,9 +31,6 @@ source_config
 REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 [ "$DEVICE" != "$REALDEVICE" ] && exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "$NETWORKING_IPV6" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 84500851..b9a00f13 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -203,9 +203,7 @@ else
 	 fi
 	 [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
 
-	 if [ "${NETWORKING_IPV6}" = "yes" ]; then
-	    /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
-	 fi
+	 /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
 	 exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
     fi
   
@@ -277,13 +275,11 @@ if [ -z "${NOZEROCONF}" -a "${ISALIAS}" = "no" -a "${REALDEVICE}" != "lo" ]; the
 fi
 
 # IPv6 initialisation?
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
-    if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then
-	/sbin/dhcp6c ${DEVICE};
-        dhcp6_pid=(`/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DEVICE}" | egrep -v grep`);
-	echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
-    fi;
+/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
+if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then
+    /sbin/dhcp6c ${DEVICE};
+    dhcp6_pid=(`/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DEVICE}" | egrep -v grep`);
+    echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
 fi
 
 if [ "${IPX}" = yes ]; then
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index e17f0b62..628f8b0a 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -368,17 +368,15 @@ function addprovider()
     fi
 
     # Setup IPv6
-    if [ "${NETWORKING_IPV6}" = "yes" ]; then
-        if [ "$IPV6INIT" = "yes" -a ! -z "$IPV6ADDR" ]; then
+    if [ "$IPV6INIT" = "yes" -a ! -z "$IPV6ADDR" ]; then
 	    # Native IPv6 use of device configured, check of encapsulation required		
             if [ "$ENCAP" = "syncppp" ]; then
 		echo $"Warning: ipppd (kernel 2.4.x and below) doesn't support IPv6 using encapsulation 'syncppp'"
             elif [ "$ENCAP" = "rawip" ]; then
 		echo $"Warning: link doesn't support IPv6 using encapsulation 'rawip'"
 	    fi
-        fi
-        /etc/sysconfig/network-scripts/ifup-ipv6 $CONFIG
     fi
+    /etc/sysconfig/network-scripts/ifup-ipv6 $CONFIG
 }
 
 addprovider || exit 1
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index caadebb1..a50d1aa4 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -17,7 +17,6 @@
 #        exit codes aren't handled by "ifup"
 #
 # Uses following information from "/etc/sysconfig/network":
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
 #  IPV6_DEFAULTDEV=<device>: controls default route (optional)
 #  IPV6_DEFAULTGW=<address>: controls default route (optional)
 #
@@ -70,9 +69,6 @@ REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 # Test whether IPv6 configuration is enabled for this interface, else stop
 [ "$IPV6INIT" = "yes" ] || exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index 33f2553a..b3206297 100755
--- a/sysconfig/network-scripts/ifup-sit
+++ b/sysconfig/network-scripts/ifup-sit
@@ -14,7 +14,6 @@
 # Version: 2003-09-08
 #
 # Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
 #  IPV6_DEFAULTDEV=<device>: controls default route (optional)
 #  IPV6_DEFAULTGW=<address>: controls default route (optional)
 #
@@ -47,9 +46,6 @@ REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 # Test whether IPv6 configuration is enabled for this interface, else stop
 [ "$IPV6INIT" = "yes" ] || exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/sysconfig/network-scripts/init.ipv6-global b/sysconfig/network-scripts/init.ipv6-global
index 0f332d66..65897b21 100755
--- a/sysconfig/network-scripts/init.ipv6-global
+++ b/sysconfig/network-scripts/init.ipv6-global
@@ -20,7 +20,6 @@
 # Called by hooks from /etc/[rc.d/]init.d/network
 #
 # Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls global IPv6 initialization (default: no)
 #  IPV6FORWARDING=yes|no: controls global IPv6 forwarding (default: no)
 #  IPV6_AUTOCONF=yes|no: controls global automatic IPv6 configuration
 #   (default: yes if IPV6FORWARDING=no, no if IPV6FORWARDING=yes)
@@ -40,9 +39,6 @@ cd /etc/sysconfig/network-scripts
 ACTION="$1"
 POSITION="$2"
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6