From 7f968d6ce159032e5f170dcedefad83894bfb95e Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Wed, 26 Jun 2002 10:20:20 +0000 Subject: - useless space changes --- ppp/ip-down | 3 ++- ppp/ip-up | 3 ++- ppp/ipv6-down | 49 ++++++++++++++++-------------------- ppp/ipv6-up | 6 ++--- sysconfig/network-scripts/ifdown-ppp | 1 + sysconfig/network-scripts/ifdown-sl | 1 + sysconfig/network-scripts/ifup-ctc | 1 + sysconfig/network-scripts/ifup-escon | 1 + sysconfig/network-scripts/ifup-iucv | 1 + sysconfig/network-scripts/ifup-plip | 1 + sysconfig/network-scripts/ifup-plusb | 1 + 11 files changed, 34 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 diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp index d867897f..1f384e19 100755 --- a/sysconfig/network-scripts/ifdown-ppp +++ b/sysconfig/network-scripts/ifdown-ppp @@ -1,4 +1,5 @@ #! /bin/bash + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts diff --git a/sysconfig/network-scripts/ifdown-sl b/sysconfig/network-scripts/ifdown-sl index 813ee0af..c4d06b56 100755 --- a/sysconfig/network-scripts/ifdown-sl +++ b/sysconfig/network-scripts/ifdown-sl @@ -1,4 +1,5 @@ #!/bin/bash + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc index 1cfa4970..0653c7b4 100755 --- a/sysconfig/network-scripts/ifup-ctc +++ b/sysconfig/network-scripts/ifup-ctc @@ -9,6 +9,7 @@ # # alias ctc0 ctc # + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts diff --git a/sysconfig/network-scripts/ifup-escon b/sysconfig/network-scripts/ifup-escon index 311aeb4b..27d906d1 100644 --- a/sysconfig/network-scripts/ifup-escon +++ b/sysconfig/network-scripts/ifup-escon @@ -10,6 +10,7 @@ # # alias escon0 ctc # + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts diff --git a/sysconfig/network-scripts/ifup-iucv b/sysconfig/network-scripts/ifup-iucv index 48c822da..a1059c6f 100755 --- a/sysconfig/network-scripts/ifup-iucv +++ b/sysconfig/network-scripts/ifup-iucv @@ -9,6 +9,7 @@ # # alias iucv0 netiucv # + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts diff --git a/sysconfig/network-scripts/ifup-plip b/sysconfig/network-scripts/ifup-plip index 25c36fea..3c9ffb99 100755 --- a/sysconfig/network-scripts/ifup-plip +++ b/sysconfig/network-scripts/ifup-plip @@ -1,4 +1,5 @@ #!/bin/sh + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts diff --git a/sysconfig/network-scripts/ifup-plusb b/sysconfig/network-scripts/ifup-plusb index 2e87b11a..84bdaba2 100755 --- a/sysconfig/network-scripts/ifup-plusb +++ b/sysconfig/network-scripts/ifup-plusb @@ -10,6 +10,7 @@ # # alias plusb0 plusb # + PATH=/sbin:/usr/sbin:/bin:/usr/bin cd /etc/sysconfig/network-scripts -- cgit v1.2.1