X-Git-Url: https://git.tld-linux.org/?p=rc-scripts.git;a=blobdiff_plain;f=lib%2Ffunctions;h=fac4c46e67cfccdca16a3f8369cbc08f803ce7c8;hp=69041da25b6dac6cb40f697b10dd28484052ae18;hb=2d25be2988d266692b556fbcc89c5b9108cf16f8;hpb=003ec37db641afcc22cd662bbc7969af80ec83a0

diff --git a/lib/functions b/lib/functions
index 69041da..fac4c46 100644
--- a/lib/functions
+++ b/lib/functions
@@ -166,21 +166,7 @@ strstr() {
 
 # Apply sysctl settings, including files in /etc/sysctl.d
 apply_sysctl() {
-	if [ -x /lib/systemd/systemd-sysctl ]; then
-		/lib/systemd/systemd-sysctl
-		return
-	fi
-
 	local file
-	for file in /usr/lib/sysctl.d/*.conf; do
-		[ -f /run/sysctl.d/${file##*/} ] && continue
-		[ -f /etc/sysctl.d/${file##*/} ] && continue
-		test -f "$file" && sysctl -q -e -p "$file"
-	done
-	for file in /run/sysctl.d/*.conf; do
-		[ -f /etc/sysctl.d/${file##*/} ] && continue
-		test -f "$file" && sysctl -q -e -p "$file"
-	done
 	for file in /etc/sysctl.d/*.conf; do
 		test -f "$file" && sysctl -q -e -p "$file"
 	done
@@ -621,7 +607,7 @@ _daemon_set_ulimits() {
 
 # A function to start a program (now it's useful on read-only filesystem too)
 daemon() {
-	local errors="" prog="" end="" waitname="" waittime=""
+	local errors="" prog="" end="" waitname="" waittime=0
 	local exit_code=0
 	local nice=$SERVICE_RUN_NICE_LEVEL
 	local fork user closefds redirfds pidfile makepid chdir=/
@@ -993,6 +979,8 @@ pidofproc() {
 		for p in $(< "${pidfile}"); do
 			[ -z "$(echo "$p" | awk '{gsub(/[0-9]/,"");print;}')" ] && pid="$pid $p"
 		done
+	else
+		unset pidfile
 	fi
 
 	# Next try "pidof" if pidfile is not specified