Don't fail if arrays are already assembled (ex raid10 with 4 devices, one device...

[projects/rc-scripts.git] / ppp / ip-down

diff --git a/ppp/ip-down b/ppp/ip-down
index 3ca963dbe521860cc6213855567f58fd5d20dde4..72e0658229c876c49418df7f1c1a65a0cb4bfff9 100755 (executable)
--- a/ppp/ip-down
+++ b/ppp/ip-down
@@ -1,25 +1,21 @@
 #!/bin/sh
 #
-# $Id: ip-down,v 1.3 1999/07/27 02:51:44 kloczek Exp $
 # This file should not be modified
 #
 # This script is run by the pppd _after_ the link is brought down.
-# It uses run-parts to run scripts in /etc/ppp/ip-down.d, so to delete
-# routes, unset IP addresses etc. you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-down.d scripts (named
-# after that package), so choose local script names with that in mind.
 #
 # This script is called with the following arguments:
-#    Arg  Name                          Example
-#    $1   Interface name                ppp0
-#    $2   The tty                       ttyS1
-#    $3   The link speed                38400
-#    $4   Local IP number               12.34.56.78
-#    $5   Peer  IP number               12.34.56.99
-#    $6   Optional ``ipparam'' value    foo
-
-# The  environment is cleared before executing this script
+#      Arg     Name                            Example
+#      $1      Interface name                  ppp0
+#      $2      The tty                         ttyS1
+#      $3      The link speed                  38400
+#      $4      Local IP number                 12.34.56.78
+#      $5      Peer IP number                  12.34.56.99
+#      $6      Optional ``ipparam'' value      foo
+
+set +e
+
+# The environment is cleared before executing this script
 # so the path must be reset
 PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
 export PATH
@@ -32,19 +28,21 @@ PPP_REMOTE="$5"
 PPP_IPPARAM="$6"
 export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
 
+. /etc/rc.d/init.d/functions
+. /lib/rc-scripts/functions.network
+CONFIG="/etc/sysconfig/interfaces/ifcfg-$PPP_IPPARAM"
+source_config
+
 # as an additional convienince, $PPP_TTYNAME is set to the tty name,
 # stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`/usr/bin/basename "$2"`
+PPP_TTYNAME=$(basename "$PPP_TTY")
 export PPP_TTYNAME
 
-# Other things
-LOGDEVICE=$6
-REALDEVICE=$1
-
 # Main Script starts here
+[ -x /etc/ppp/ip-down.local ] && /etc/ppp/ip-down.local
 
-run-parts /etc/ppp/ip-down.d
+run-parts /etc/sysconfig/interfaces/down.d/ppp
 
-/etc/sysconfig/network-scripts/ifdown-post ifcfg-${LOGDEVICE}
+/lib/rc-scripts/ifdown-post "${CONFIG}"
 
 exit 0