diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-12-10 16:07:34 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-12-10 16:07:34 -0500 |
| commit | aae838df0e7852088392231af90ba2e36629e98a (patch) | |
| tree | ac55b95b21ced81d85993b6bdd48b1fb306b5414 | |
| parent | 1491819035155061011e3a5df9f8977425b1940c (diff) | |
| download | initscripts-aae838df0e7852088392231af90ba2e36629e98a.tar initscripts-aae838df0e7852088392231af90ba2e36629e98a.tar.gz initscripts-aae838df0e7852088392231af90ba2e36629e98a.tar.bz2 initscripts-aae838df0e7852088392231af90ba2e36629e98a.tar.xz initscripts-aae838df0e7852088392231af90ba2e36629e98a.zip | |
Remove CIPE, IPSEC specific interface support.
| -rwxr-xr-x | rc.d/init.d/network | 22 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 6 |
2 files changed, 2 insertions, 26 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 28c6c905..959fd592 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -78,7 +78,6 @@ case "$1" in esac vlaninterfaces="" - vpninterfaces="" xdslinterfaces="" bridgeinterfaces="" @@ -91,10 +90,6 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi - if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then - vpninterfaces="$vpninterfaces $i" - continue - fi if [ "$TYPE" = "xDSL" ]; then xdslinterfaces="$xdslinterfaces $i" continue @@ -104,10 +99,6 @@ case "$1" in bridgeinterfaces="$bridgeinterfaces $i" continue fi - if [ "$TYPE" = "IPSEC" ]; then - vpninterfaces="$vpninterfaces $i" - continue - fi if [ "${DEVICE%%.*}" != "$DEVICE" -o "${DEVICE##vlan}" != "$DEVICE" ] ; then vlaninterfaces="$vlaninterfaces $i" @@ -133,7 +124,7 @@ case "$1" in done # Bring up xDSL and VPN interfaces - for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $vpninterfaces ; do + for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces ; do if ! LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then # If we're in confirmation mode, get user confirmation. if [ -f /var/run/confirm ]; then @@ -186,7 +177,6 @@ case "$1" in fi vlaninterfaces="" - vpninterfaces="" xdslinterfaces="" bridgeinterfaces="" remaining="" @@ -200,14 +190,6 @@ case "$1" in if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi - if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then - vpninterfaces="$vpninterfaces $i" - continue - fi - if [ "$TYPE" = "IPSEC" ]; then - vpninterfaces="$vpninterfaces $i" - continue - fi if [ "$TYPE" = "Bridge" ]; then bridgeinterfaces="$bridgeinterfaces $i" continue @@ -224,7 +206,7 @@ case "$1" in remaining="$remaining $i" done - for i in $vpninterfaces $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do + for i in $xdslinterfaces $bridgeinterfaces $vlaninterfaces $remaining; do (. ./ifcfg-$i if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 5212d2e0..2ce41b0e 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -74,12 +74,6 @@ source_config () Ethernet) DEVICETYPE="eth" ;; - CIPE) - DEVICETYPE="cipcb" - ;; - IPSEC) - DEVICETYPE="ipsec" - ;; Modem) DEVICETYPE="ppp" ;; |