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

diff --git a/lib/functions b/lib/functions
index 69041da..ced6e97 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
@@ -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