aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-12-10 15:58:57 -0500
committerLukas Nykryn <lnykryn@redhat.com>2014-01-15 15:17:03 +0100
commit8eb6830015b4328141b17d2e69bd106c067b4f7a (patch)
treefcce73342e1f6c9453303a6d2354ebb7bb71461f
parent9baa0f88820005d6900aeb6d1739c94e5f1cd628 (diff)
downloadinitscripts-8eb6830015b4328141b17d2e69bd106c067b4f7a.tar
initscripts-8eb6830015b4328141b17d2e69bd106c067b4f7a.tar.gz
initscripts-8eb6830015b4328141b17d2e69bd106c067b4f7a.tar.bz2
initscripts-8eb6830015b4328141b17d2e69bd106c067b4f7a.tar.xz
initscripts-8eb6830015b4328141b17d2e69bd106c067b4f7a.zip
Delete IPX support.
Conflicts: rc.d/init.d/network sysconfig.txt sysconfig/network-scripts/ifup-ipx
-rwxr-xr-xrc.d/init.d/network20
-rw-r--r--sysconfig.txt10
-rwxr-xr-xsysconfig/network-scripts/ifup-eth4
-rwxr-xr-xsysconfig/network-scripts/ifup-ipx41
4 files changed, 0 insertions, 75 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index b4ce2b31..e48c99b0 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -33,8 +33,6 @@ fi
# if the ip configuration utility isn't around we can't function.
[ -x /sbin/ip ] || exit 1
-# Even if IPX is configured, without the utilities we can't do much
-[ ! -x /sbin/ipx_internal_net ] || [ ! -x /sbin/ipx_configure ] && IPX=
CWD=$(pwd)
cd /etc/sysconfig/network-scripts
@@ -66,16 +64,6 @@ case "$1" in
# bring up loopback interface
action $"Bringing up loopback interface: " ./ifup ifcfg-lo
- case "$IPX" in
- yes|true)
- /sbin/ipx_configure --auto_primary=$IPXAUTOPRIMARY \
- --auto_interface=$IPXAUTOFRAME
- if [ "$IPXINTERNALNETNUM" != "0" ]; then
- /sbin/ipx_internal_net add $IPXINTERNALNETNUM $IPXINTERNALNODENUM
- fi
- ;;
- esac
-
case "$VLAN" in
yes)
if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1 ; then
@@ -226,14 +214,6 @@ case "$1" in
)
done
- case "$IPX" in
- yes|true)
- if [ "$IPXINTERNALNETNUM" != "0" ]; then
- /sbin/ipx_internal_net del
- fi
- ;;
- esac
-
action $"Shutting down loopback interface: " ./ifdown ifcfg-lo
sysctl -w net.ipv4.ip_forward=0 > /dev/null 2>&1
diff --git a/sysconfig.txt b/sysconfig.txt
index 73e7a1ca..e34ca1b9 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -170,16 +170,9 @@ Generic options:
GATEWAY=<gateway IP>
GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0)
NISDOMAIN=<nis domain name>
- IPX=yes|no
- IPXAUTOPRIMARY=on|off (note, that MUST be on|off, not yes|no)
- IPXAUTOFRAME=on|off (again, not yes|no)
- IPXINTERNALNETNUM=<netnum>
- IPXINTERNALNODENUM=<nodenum>
NOZEROCONF=
Set this to not set a route for dynamic link-local addresses.
- All the IPX stuff is optional, and should default to off.
-
NETWORKDELAY=<delay in seconds>
Delay in seconds after all network interfaces are initialized. Useful if
network has spanning tree running and must wait for STP convergence.
@@ -691,9 +684,6 @@ Files in /etc/sysconfig/network-scripts/
only, not IPv6 addresses.
Ethernet-only items:
- {IPXNETNUM,IPXPRIMARY,IPXACTIVE}_{802_2,802_3,ETHERII,SNAP}
- configuration matrix for IPX. Only used if IPX is active.
- Managed from /etc/sysconfig/network-scripts/ifup-ipx
ARP=yes|no (adds 'arp' flag to ip, for use with the
ethertap device)
LINKDELAY=<time in seconds>
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index c8287d64..c94c535e 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -297,9 +297,5 @@ if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
fi
fi
-if [ "${IPX}" = yes ]; then
- /etc/sysconfig/network-scripts/ifup-ipx ${DEVICE}
-fi
-
exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
diff --git a/sysconfig/network-scripts/ifup-ipx b/sysconfig/network-scripts/ifup-ipx
deleted file mode 100755
index dbd294a8..00000000
--- a/sysconfig/network-scripts/ifup-ipx
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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
-
-# cannot configure IPX with non-existent utilities
-[ -x /sbin/ipx_interface ] || exit 0
-
-. /etc/sysconfig/network
-
-case $IPX in yes|true) ;; *) exit 0 ;; esac
-
-cd /etc/sysconfig/network-scripts
-. ./network-functions
-
-CONFIG=$1
-[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
-source_config
-
-for frametype in 802.2 802.3 ETHERII SNAP ; do
- framename=${frametype/./_}
- eval ACT=\$IPXACTIVE_$framename
- case $ACT in
- yes|true)
- eval PRIM=\$IPXPRIMARY_$framename
- case $PRIM in
- yes|true) primary=-p ;;
- *) primary= ;;
- esac
- eval NUM=\$IPXNETNUM_$framename
- /sbin/ipx_interface add $primary $1 $frametype $NUM
- ;;
- esac
-done
-
-exit 0