aboutsummaryrefslogtreecommitdiffstats
path: root/ppp
diff options
context:
space:
mode:
authorFlorian La Roche <laroche@redhat.com>2002-06-26 10:20:20 +0000
committerFlorian La Roche <laroche@redhat.com>2002-06-26 10:20:20 +0000
commit7f968d6ce159032e5f170dcedefad83894bfb95e (patch)
tree5ed6c9dca4438cf3531276f0f35d018254871a11 /ppp
parent943815067d4b3a1b01a524ac45fa66415e0e45e8 (diff)
downloadinitscripts-7f968d6ce159032e5f170dcedefad83894bfb95e.tar
initscripts-7f968d6ce159032e5f170dcedefad83894bfb95e.tar.gz
initscripts-7f968d6ce159032e5f170dcedefad83894bfb95e.tar.bz2
initscripts-7f968d6ce159032e5f170dcedefad83894bfb95e.tar.xz
initscripts-7f968d6ce159032e5f170dcedefad83894bfb95e.zip
- useless space changes
Diffstat (limited to 'ppp')
-rw-r--r--ppp/ip-down3
-rw-r--r--ppp/ip-up3
-rw-r--r--ppp/ipv6-down49
-rw-r--r--ppp/ipv6-up6
4 files changed, 27 insertions, 34 deletions
diff --git a/ppp/ip-down b/ppp/ip-down
index c917552c..70f1aa8f 100644
--- a/ppp/ip-down
+++ b/ppp/ip-down
@@ -6,7 +6,8 @@
LOGDEVICE=$6
REALDEVICE=$1
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
[ -x /etc/ppp/ip-down.local ] && /etc/ppp/ip-down.local "$@"
diff --git a/ppp/ip-up b/ppp/ip-up
index 685c2dfb..47517489 100644
--- a/ppp/ip-up
+++ b/ppp/ip-up
@@ -6,7 +6,8 @@
LOGDEVICE=$6
REALDEVICE=$1
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
[ -f /etc/sysconfig/network-scripts/ifcfg-${LOGDEVICE} ] && /etc/sysconfig/network-scripts/ifup-post ifcfg-${LOGDEVICE}
diff --git a/ppp/ipv6-down b/ppp/ipv6-down
index bc077de8..1261537b 100644
--- a/ppp/ipv6-down
+++ b/ppp/ipv6-down
@@ -1,40 +1,33 @@
#!/bin/bash
-
-# Version: 2002-01-12
-
# This file should not be modified -- make local changes to
# /etc/ppp/ipv6-down.local instead
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
+
LOGDEVICE=$6
REALDEVICE=$1
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
[ -x /etc/ppp/ipv6-up.local ] && /etc/ppp/ipv6-up.local "$@"
-# Setup IP6
-if [ -f /etc/sysconfig/network ]; then
- . /etc/sysconfig/network
-
- if [ "${NETWORKING_IPV6}" = "yes" -a -x /etc/sysconfig/network-scripts/ifdown-ipv6 ]; then
- # Source IPv4 helper functions
- cd /etc/sysconfig/network-scripts
- . network-functions
-
- # Source IPv6 helper functions
- . /etc/sysconfig/network-scripts/network-functions-ipv6
-
- CONFIG=$1
- [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
- source_config
-
- /etc/sysconfig/network-scripts/ifdown-ipv6 $REALDEVICE
-
- if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then
- # Control running radvd
- ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
- fi
- fi
+[ -x /etc/sysconfig/network-scripts/ifdown-ipv6 ] || exit 0
+[ -f /etc/sysconfig/network ] || exit 0
+. /etc/sysconfig/network
+[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
+
+cd /etc/sysconfig/network-scripts
+. network-functions
+. /etc/sysconfig/network-scripts/network-functions-ipv6
+
+CONFIG=$1
+[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
+source_config
+
+/etc/sysconfig/network-scripts/ifdown-ipv6 $REALDEVICE
+
+if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then
+ # Control running radvd
+ ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
fi
exit 0
diff --git a/ppp/ipv6-up b/ppp/ipv6-up
index 921f8cdd..ebc454c9 100644
--- a/ppp/ipv6-up
+++ b/ppp/ipv6-up
@@ -1,15 +1,13 @@
#!/bin/bash
-
# This file should not be modified -- make local changes to
# /etc/ppp/ipv6-up.local instead
-# Version: 2002-01-12
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
LOGDEVICE=$6
REALDEVICE=$1
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
# Setup IPv6
if [ -f /etc/sysconfig/network ]; then
. /etc/sysconfig/network