diff options
-rwxr-xr-x | rc.d/init.d/single | 2 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifdown | 5 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup | 4 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-ippp | 3 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-ppp | 4 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-routes | 4 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-sl | 5 | ||||
-rw-r--r-- | sysvinitfiles | 4 |
8 files changed, 12 insertions, 19 deletions
diff --git a/rc.d/init.d/single b/rc.d/init.d/single index 51459e64..2f223822 100755 --- a/rc.d/init.d/single +++ b/rc.d/init.d/single @@ -10,7 +10,7 @@ # Modified for RHS Linux by Damien Neil # -. /etc/rc.d/init.d/functions +. /etc/init.d/functions if [ "$1" != "start" ] ; then exit 0 diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 95f11001..9f07eb6f 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -1,10 +1,9 @@ #!/bin/bash -PATH=/sbin:/usr/sbin:/bin:/usr/bin -TEXTDOMAIN=initscripts + +. /etc/init.d/functions cd /etc/sysconfig/network-scripts . network-functions -. /etc/rc.d/init.d/functions CONFIG=$1 diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 66c53c37..b4c20045 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -9,12 +9,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -PATH=/sbin:/usr/sbin:/bin:/usr/bin -TEXTDOMAIN=initscripts +. /etc/init.d/functions cd /etc/sysconfig/network-scripts . network-functions -. /etc/rc.d/init.d/functions [ -f ../network ] && . ../network [ -f ../networking/network ] && . ../networking/network diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp index c30abfc8..387689d9 100755 --- a/sysconfig/network-scripts/ifup-ippp +++ b/sysconfig/network-scripts/ifup-ippp @@ -4,11 +4,10 @@ # # This script is normally called from the ifup script when it detects a ippp device. -PATH=/sbin:/usr/sbin:/bin:/usr/bin +. /etc/init.d/functions cd /etc/sysconfig/network-scripts . network-functions -. /etc/rc.d/init.d/functions # Get global network configuration [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp index 991476d7..9a869479 100755 --- a/sysconfig/network-scripts/ifup-ppp +++ b/sysconfig/network-scripts/ifup-ppp @@ -1,9 +1,9 @@ #! /bin/bash -PATH=/sbin:/usr/sbin:/bin:/usr/bin + +. /etc/init.d/functions cd /etc/sysconfig/network-scripts . network-functions -. /etc/rc.d/init.d/functions # ifup-post for PPP is handled through /etc/ppp/ip-up if [ "${1}" = daemon ] ; then diff --git a/sysconfig/network-scripts/ifup-routes b/sysconfig/network-scripts/ifup-routes index f66a78c0..2ce874c8 100755 --- a/sysconfig/network-scripts/ifup-routes +++ b/sysconfig/network-scripts/ifup-routes @@ -1,9 +1,7 @@ #!/bin/bash -TEXTDOMAIN=initscripts - # adds static routes which go through device $1 -. /etc/rc.d/init.d/functions +. /etc/init.d/functions if [ "$1" = "" ]; then echo $"usage: ifup-routes <net-device>" diff --git a/sysconfig/network-scripts/ifup-sl b/sysconfig/network-scripts/ifup-sl index 27be5fe3..8e745bb5 100755 --- a/sysconfig/network-scripts/ifup-sl +++ b/sysconfig/network-scripts/ifup-sl @@ -1,7 +1,6 @@ #!/bin/bash -TEXTDOMAIN=initscripts -PATH=/sbin:/usr/sbin:/bin:/usr/bin -. /etc/rc.d/init.d/functions + +. /etc/init.d/functions # ifup-post can't be done for slip :-( Solution: use PPP diff --git a/sysvinitfiles b/sysvinitfiles index 73dae34a..166dbdc3 100644 --- a/sysvinitfiles +++ b/sysvinitfiles @@ -26,7 +26,7 @@ Sample Script # mistaken for tags, should they happen to fit the pattern.> # Source function library. -. /etc/rc.d/init.d/functions +. /etc/init.d/functions <define any local shell functions used by the code that follows> @@ -97,7 +97,7 @@ Notes: $0 start This saves a few shell invocations. -Functions in /etc/rc.d/init.d/functions +Functions in /etc/init.d/functions ======================================= daemon [ --check <name> ] [ --user <username>] |