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>

4 files changed, 6 insertions, 13 deletions

diff --git a/functions b/functions
index 4a4b05a..63999a1 100644
--- a/functions
+++ b/functions
@@ -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:
diff --git a/rc.multi b/rc.multi
index 678b50e..8050e98 100755
--- a/rc.multi
+++ b/rc.multi
@@ -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
 
diff --git a/rc.single b/rc.single
index 38454f6..f32e373 100755
--- a/rc.single
+++ b/rc.single
@@ -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[@]}
diff --git a/rc.sysinit b/rc.sysinit
index 79cfcac..39cf7f9 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -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"