X-Git-Url: https://git.tld-linux.org/?p=rc-scripts.git;a=blobdiff_plain;f=lib%2Ffunctions;h=fac4c46e67cfccdca16a3f8369cbc08f803ce7c8;hp=98de9cc751aab69f60b2deff4bc31f9620111ffb;hb=2d25be2988d266692b556fbcc89c5b9108cf16f8;hpb=404f23ce096d6186062f68db607edac4a7068d61

diff --git a/lib/functions b/lib/functions
index 98de9cc..fac4c46 100644
--- a/lib/functions
+++ b/lib/functions
@@ -5,11 +5,13 @@
 #
 # Author:	Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:	Greg Galloway and Marc Ewing
-# Modified for TLD Linux by:
+# Modified for PLD Linux by:
 #		Marek Obuchowicz <elephant@pld-linux.org>
 #		Arkadiusz Miśkiewicz <misiek@pld-linux.org>
 #		Michał Kochanowicz <mkochano@pld-linux.org>
 #		Łukasz Pawelczyk <havner@pld-linux.org>
+# Modified for TLD Linux by:
+#		Marcin Krol <hawk@tld-linux.org>
 
 # First set up a default search path.
 export PATH="/sbin:/usr/sbin:/bin:/usr/bin"
@@ -58,17 +60,6 @@ CCHARS="$NORMAL"	# Color of these characters (look at /etc/sysconfig/init-colors
 [ -r /etc/sysconfig/system ] && . /etc/sysconfig/system
 [ -r /etc/sysconfig/bootsplash ] && . /etc/sysconfig/bootsplash
 
-# if initscript is invoked via bash, enable RedHat/Fedora compatibility
-# RC_FEDORA is "set" if enabled and "unset" when not, but it's "value" is always empty
-# this is useful for inline constructs
-if [ "${BASH_VERSION+set}" = "set" ]; then
-	RC_LOGGING=yes
-	FASTRC=no
-	RC_FEDORA=
-else
-	unset RC_FEDORA || :
-fi
-
 if [ -z "$VSERVER" -o "$VSERVER" = "detect" ]; then
 	{
 		while read _f _ctx; do
@@ -175,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
@@ -466,7 +443,7 @@ busy() {
 }
 
 ok() {
-	echo -ne "$_ok${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
+	echo "$_ok"
 }
 
 started() {
@@ -474,7 +451,7 @@ started() {
 }
 
 fail() {
-	echo -ne "$_fail${RC_FEDORA+\\r}${RC_FEDORA-\\n}"
+	echo "$_fail"
 	return 1
 }
 
@@ -588,7 +565,7 @@ run_cmd() {
 		cd /
 		export HOME=/tmp TMPDIR=/tmp
 		if is_no "$RC_LOGGING"; then
-			${user:+setuidgid -s $user} "$@" 2>&1
+			${user:+setuidgid -s $user} eval "$@" 2>&1
 		else
 			${user:+setuidgid -s $user} initlog -c "$*" 2>&1
 		fi
@@ -630,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=/
@@ -1002,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
@@ -1332,35 +1311,6 @@ rc_gettext_init() {
 	fi
 }
 
-use_upstart () {
-	return 1
-}
-emit () {
-	return 0
-}
-is_upstart_task() {
-	return 1
-}
-is_upstart_running() {
-	return 1
-}
-upstart_start() {
-	return 1
-}
-upstart_stop() {
-	return 1
-}
-upstart_reload() {
-	return 0
-}
-upstart_status() {
-	return 1
-}
-_upstart_controlled() {
-	return 0
-}
-alias upstart_controlled='_upstart_controlled $0 "$@"'
-
 rc_gettext_init
 rc_cache_init