diff options
author | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-05-22 13:02:55 -0400 |
---|---|---|
committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-05-22 13:02:55 -0400 |
commit | 63db98c2a8e256f9219c5c6501b40846040bf089 (patch) | |
tree | a557ce1a362acc73dc089685c423d9a0885fe635 | |
parent | de031161e02772aaeaefed1398f8ad59621bd8bc (diff) | |
download | initscripts-63db98c2a8e256f9219c5c6501b40846040bf089.tar.xz |
Remove source_functions in favor of always sourcing the dir
This is an obvious oversight on my part - this change allows
the overridden functions to work in daemon scripts and
anything else that uses /etc/rc.d/functions by itself.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r-- | functions | 13 | ||||
-rwxr-xr-x | rc.multi | 2 | ||||
-rwxr-xr-x | rc.single | 2 | ||||
-rwxr-xr-x | rc.sysinit | 2 |
4 files changed, 6 insertions, 13 deletions
@@ -151,13 +151,12 @@ ck_depends() { done } -source_functions() { - if [ -d /etc/rc.d/functions.d/ ]; then - for f in $(/bin/ls /etc/rc.d/functions.d/); do - . /etc/rc.d/functions.d/$f - done - fi -} +#Source additional functions at the end to allow overrides +if [ -d /etc/rc.d/functions.d/ ]; then + for f in $(/bin/ls /etc/rc.d/functions.d/); do + . /etc/rc.d/functions.d/$f + done +fi # End of file # vim: set ts=2 noet: @@ -6,8 +6,6 @@ . /etc/rc.conf . /etc/rc.d/functions -source_functions - # Load sysctl variables if sysctl.conf is present [ -r /etc/sysctl.conf ] && /sbin/sysctl -q -p &>/dev/null @@ -6,8 +6,6 @@ . /etc/rc.conf . /etc/rc.d/functions -source_functions - if [ "$PREVLEVEL" = "3" -o "$PREVLEVEL" = "5" ]; then # Shutdown daemons let i=${#DAEMONS[@]} @@ -6,8 +6,6 @@ . /etc/rc.conf . /etc/rc.d/functions -source_functions - echo " " printhl "Arch Linux $C_OTHER(${C_H2}Core Dump$C_OTHER)\n" printhl "${C_H2}http://www.archlinux.org" |