update to linuxconf 1.11r8 capabilities.

Full support for IPX as configured by linuxconf.
Updated sysconfig.txt documentation to reflect new parameters.

3 files changed, 50 insertions, 2 deletions

diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index cf2f4779..18505370 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -173,4 +173,10 @@ if [ "$IPSETUP" != yes ]; then
     fi
 fi
 
+case $CONFIG in
+  eth*)
+	/etc/sysconfig/network-scripts/ifup-ipx $CONFIG
+	;;
+esac
+
 exec /etc/sysconfig/network-scripts/ifup-post $CONFIG
diff --git a/sysconfig/network-scripts/ifup-ipx b/sysconfig/network-scripts/ifup-ipx
new file mode 100755
index 00000000..b04fda67
--- /dev/null
+++ b/sysconfig/network-scripts/ifup-ipx
@@ -0,0 +1,44 @@
+#!/bin/bash
+# configures IPX on $1 if appropriate
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+if [ "$1" = "" ]; then
+	echo "usage: $0 <net-device>"
+	exit 1
+fi
+
+if [ ! -x /usr/bin/ipx_interface ] ; then
+	# cannot configure IPX with non-existant utilities
+	exit 0
+fi
+
+. /etc/sysconfig/network
+
+case $IPX in yes|true) ;; *) exit 0 ;; esac
+
+cd /etc/sysconfig/network-scripts
+
+. network-functions
+
+CONFIG=$1
+source_config
+
+for frametype in 802_2 802_3 ETHERII SNAP ; do
+    # Yes, this kind of evaluation is really necessary to do this.
+    # Welcome to shell programming...  No, we were not smoking some
+    # particularly good floppies while we wrote this.  :-)
+    case $(eval echo $(echo \$`echo IPXACTIVE_$frametype`)) in
+	yes|true)
+		case $(eval echo $(echo \$`echo IPXPRIMARY_$frametype`)) in
+		    yes|true) primary=-p ;;
+		    *) primary= ;;
+		esac
+		/usr/bin/ipx_interface add $1 $primary $frametype \
+		  $(eval echo $(echo \$`echo IPXNETNUM_$frametype`))
+		;;
+    esac
+done
+
+exit 0
+
diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes
index 6cae8d4c..f0dde135 100755
--- a/sysconfig/network-scripts/ifup-routes
+++ b/sysconfig/network-scripts/ifup-routes
@@ -8,10 +8,8 @@ if [ "$1" = "" ]; then
 fi
 
 if [ -x /bin/linuxconf ] ; then
-	rm -f /var/run/routes.current
 	linuxconf --hint routing "$1" | while read args; do
 	    /sbin/route $args
-	    echo $args >> /var/run/routes.current
 	done
 else
 	if [ ! -f /etc/sysconfig/static-routes ]; then