- started merging TOTALNEW

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

diff --git a/ppp/ip-up b/ppp/ip-up
index 5435150bd2e4200abcf5700d91ebf323fb8bcaaf..41b164be955bdbd00af6aae3ec3eb27c893a3968 100755 (executable)
--- a/ppp/ip-up
+++ b/ppp/ip-up
@@ -1,14 +1,9 @@
 #!/bin/sh
 #
-# $Id: ip-up,v 1.5 2000/05/07 19:00:00 siefca Exp $
+# $Id: ip-up,v 1.6 2002/03/19 18:18:06 misiek Exp $
 # This file should not be modified
 #
 # This script is run by the pppd after the link is established.
-# It uses run-parts to run scripts in /etc/ppp/ip-up.d, so to add routes,
-# set IP address, run the mailq etc. you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-up.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
@@ -19,6 +14,8 @@
 #    $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
@@ -31,17 +28,20 @@ PPP_LOCAL="$4"
 PPP_REMOTE="$5"
 PPP_IPPARAM="$6"
 export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
- 
-. /etc/sysconfig/network-scripts/.functions 
+
+. /etc/rc.d/init.d/functions 
+. /etc/sysconfig/network-scripts/functions.network 
 CONFIG="$PPP_IPPARAM"
 source_config
 
 # as an additional convenience, $PPP_TTYNAME is set to the tty name,
 # stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`basename "$PPP_TTY"`
+PPP_TTYNAME=$(basename "$PPP_TTY")
 export PPP_TTYNAME
 
 # Main Script starts here
+[ -x /etc/ppp/ip-up.local ] && /etc/ppp/ip-up.local
+
 run-parts /etc/sysconfig/interfaces/up.d/ppp
 
 /etc/sysconfig/network-scripts/ifup-post "$CONFIG"