actually include ipv6 files in the spec file

6 files changed, 19 insertions, 10 deletions

diff --git a/initscripts.spec b/initscripts.spec
index 84476cc9..a3ef4efb 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 5.60.1
+Version: 5.61
 Copyright: GPL
 Group: System Environment/Base
 Release: 1
@@ -195,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/sysconfig/console
 %config(noreplace) /etc/sysconfig/rawdevices
 %config /etc/sysconfig/network-scripts/network-functions
+%config /etc/sysconfig/network-scripts/network-functions-ipv6
 %config /etc/sysconfig/network-scripts/ifup-post
 %config /etc/sysconfig/network-scripts/ifcfg-lo
 %config /etc/sysconfig/network-scripts/ifdown-ppp
@@ -203,6 +204,11 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/sysconfig/network-scripts/ifup-sl
 %config /etc/sysconfig/network-scripts/ifup-routes
 %config /etc/sysconfig/network-scripts/ifup-plip
+%config /etc/sysconfig/network-scripts/ifup-plusb
+%config /etc/sysconfig/network-scripts/ifup-ipv6
+%config /etc/sysconfig/network-scripts/ifdown-ipv6
+%config /etc/sysconfig/network-scripts/ifup-sit
+%config /etc/sysconfig/network-scripts/ifdown-sit
 %config /etc/sysconfig/network-scripts/ifup-aliases
 %config /etc/sysconfig/network-scripts/ifup-ipx
 %config /etc/X11/prefdm
@@ -240,11 +246,14 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/ppp/ip-up
 %config /etc/ppp/ip-down
 %config /etc/initlog.conf
-%doc sysconfig.txt sysvinitfiles ChangeLog
+%doc sysconfig.txt sysvinitfiles ChangeLog sysconfig/static-routes-ipv6
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+* Fri Feb  2 2001 Bill Nottingham <notting@redhat.com>
+- actually *ship* the ipv6 (and plusb) files
+
 * Thu Feb  1 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - updated i18n
 
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
index 5d443cf1..fcef285b 100755
--- a/sysconfig/network-scripts/ifdown-ipv6
+++ b/sysconfig/network-scripts/ifdown-ipv6
@@ -16,7 +16,7 @@ CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config
 
-# Test if IPv6 configuration is enabled
+# Test if IPv6 configuration is enabled for this interface
 if [ ! "$IPV6INIT" = "yes" ]; then
         # not enabled, stop here
         exit 0
diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit
index fb345359..3eba5d79 100755
--- a/sysconfig/network-scripts/ifdown-sit
+++ b/sysconfig/network-scripts/ifdown-sit
@@ -16,7 +16,7 @@ CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config
 
-# Test if IPv6 configuration is enabled
+# Test if IPv6 configuration is enabled for this interface
 if [ ! "$IPV6INIT" = "yes" ]; then
         # not enabled, stop here
         exit 0
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 23d02eb8..e69262c8 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -15,7 +15,7 @@ CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config  
 
-# Test if IPv6 configuration is enabled
+# Test if IPv6 configuration is enabled for this interface
 if [ ! "$IPV6INIT" = "yes" ]; then
 	# not enabled, stop here
 	exit 0
@@ -41,7 +41,7 @@ if [ "${NETWORKING_IPV6}" = "yes" ]; then
 	fi
 
 	# Setup additional static IPv6 routes on specified interface
-        [ -f /etc/sysconfig/static-routes-ipv6 ]; then
+        if [ -f /etc/sysconfig/static-routes-ipv6 ]; then
 		grep "^$DEVICE" /etc/sysconfig/static-routes-ipv6 | while read device args; do
 			if [ "$device" = "$DEVICE" ]; then
 				ifup_ipv6_route $args $DEVICE
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index a7c5a315..ef703943 100755
--- a/sysconfig/network-scripts/ifup-sit
+++ b/sysconfig/network-scripts/ifup-sit
@@ -15,7 +15,7 @@ CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config  
 
-# Test if IPv6 configuration is enabled
+# Test if IPv6 configuration is enabled for this interface
 if [ ! "$IPV6INIT" = "yes" ]; then
 	# not enabled, stop here
 	exit 0
diff --git a/sysconfig/network-scripts/network-functions-ipv6 b/sysconfig/network-scripts/network-functions-ipv6
index 71c0f005..c8c61cc4 100644
--- a/sysconfig/network-scripts/network-functions-ipv6
+++ b/sysconfig/network-scripts/network-functions-ipv6
@@ -33,7 +33,7 @@ function test_ipv6()
     fi
 
     if ! [ -f /proc/net/if_inet6 ]; then
-        echo "Do not found IPv6 in kernel, try to load module"
+        echo "Did not find IPv6 in kernel, trying to load module"
 	modprobe ipv6
 	
         if ! [ -f /proc/net/if_inet6 ]; then
@@ -89,7 +89,7 @@ function ifup_ipv6_route() {
 	device=$3		# maybe empty
 
 	if [ -z $networkipv6 ]; then
-		echo $"Missing option IPv6-network'"
+		echo $"Missing option 'IPv6-network'"
 		ifup_ipv6_route_usage
 		return 1
 	fi
@@ -237,7 +237,7 @@ function ifdown_ipv6_tunnel() {
 		route -A inet6 del $routeipv6 gw ::$addressipv4tunnel dev sit0
         fi
 
-        # disable IPv6-over-IPv4 tunnels (if no longer a tunnel is up)
+        # disable IPv6-over-IPv4 tunnels (if tunnel is no longer up)
 	if route -A inet6 -n | grep sit0 | grep -v -q "^::"; then
 		# existing routes, do nothing
 		true