From ee673429a7dae3de798f97ec323ea2530c22348e Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 24 Jul 2001 20:09:07 +0000
Subject: ipv6 update (<pekkas@netcore.fi>)

---
 ppp/ip-down.ipv6to4 | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'ppp/ip-down.ipv6to4')

diff --git a/ppp/ip-down.ipv6to4 b/ppp/ip-down.ipv6to4
index 2f481708..29a4e8a0 100644
--- a/ppp/ip-down.ipv6to4
+++ b/ppp/ip-down.ipv6to4
@@ -6,7 +6,7 @@
 # Taken from:
 # (P) & (C) 2000-2001 by Peter Bieringer <pb@bieringer.de>
 #
-# Version 2001-05-07
+# Version 2001-07-15a
 #
 # Calling parameters:
 #  $1: interface name
@@ -42,11 +42,8 @@ CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config                                                                   
 
-# Test if IPv6 is globally enabled
-if [ ! "${NETWORKING_IPV6}" = "yes" ]; then
-        # Global IPv6 switch not enabled, end now
-        exit 0
-fi
+# 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
@@ -70,7 +67,6 @@ if [ "$valid6to4config" = "yes" ]; then
 	if [ "$IPV6TO4_CONTROL_RADVD" = "yes" ]; then
 		# stop RADVD from distributing no longer usable 6to4 prefixes
 		if [ -z "$IPV6TO4_RADVD_PIDFILE" ]; then
-			# Take default
 			IPV6TO4_RADVD_PIDFILE="/var/run/radvd/radvd.pid"
 		fi
 		# Send SIGHUP to radvd
-- 
cgit v1.2.1