X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffunctions;h=fb41ffa17f86c6ee922679bc64e1bf5dd04151cc;hb=49ade4f4b5b1978db4561d62063008a339a1526f;hp=6d68d96a22c6c6aa69cf751d28946617b73fba1e;hpb=a50fdc3af84c5a9f83fd4593dc7cdc7efa3a68ef;p=rc-scripts.git

diff --git a/lib/functions b/lib/functions
index 6d68d96..fb41ffa 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"
@@ -164,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
@@ -617,16 +605,90 @@ _daemon_set_ulimits() {
 	done
 }
 
+# inner function used by daemon().
+# do not call this directly, as it expects variables being inherited.
+# also it expects to be called from subshell as it exports env.
+# it expects options parsed by daemon() and command to be executed in "$@".
+_daemon_exec() {
+	local prog=""
+	umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK};
+	export USER=root HOME=/tmp TMPDIR=/tmp
+
+	nice=${nice:-$DEFAULT_SERVICE_RUN_NICE_LEVEL}
+	nice=${nice:-0}
+
+	# make nice level absolute, not to be dependant of nice level of shell where service started
+	nice=$(($nice - $(nice)))
+
+	if [ "$closefds" = 1 ]; then
+		exec 1>&-
+		exec 2>&-
+		exec 0<&-
+	elif [ "$redirfds" = 1 ]; then
+		exec 1>/dev/null
+		exec 2>/dev/null
+		exec 0</dev/null
+	else
+		exec 2>&1
+		exec 0</dev/null
+	fi
+
+	if is_no "$RC_LOGGING"; then
+		prog=$1; shift
+		if [ ! -x $prog ]; then
+			logger -t rc-scripts -p daemon.debug "daemon: Searching PATH for $prog, consider using full path in initscript"
+			local a o=$IFS
+			IFS=:
+			for a in $PATH; do
+				if [ -x $a/$prog ]; then
+					prog=$a/$prog
+					break
+				fi
+			done
+			IFS=$o
+		fi
+		set -- "$prog" "$@"
+
+		# use setsid to detach from terminal,
+		# NOTE: setsid needs to be "outer" program
+		# otherwise start-stop-daemon would capture the setsid pid not the actual program
+
+		prog=$1; shift
+		/usr/bin/setsid \
+		/sbin/start-stop-daemon -q --start \
+			--nicelevel $nice \
+			${pidfile:+--pidfile $pidfile} \
+			${makepid:+--make-pidfile} \
+			${user:+--chuid $user} \
+			${chdir:+--chdir "$chdir"} \
+			${fork:+--background} \
+			${SERVICE_DROPCAPS:+--dropcap $SERVICE_DROPCAPS} \
+			--exec "$prog" \
+			-- "$@"
+	else
+		if [ "$fork" = "1" ]; then
+			export PIDFILE="/dev/null"
+			if [ "$makepid" ] && [ "$pidfile" ]; then
+				export PIDFILE="$pidfile"
+			fi
+			set -- /lib/rc-scripts/makepid "$@"
+			set -- /usr/bin/setsid "$@"
+		fi
+		if [ -n "$user" -a "$user" != "root" ]; then
+			set -- /bin/runuser -u "$user" -- "$@"
+		fi
+
+		nice -n $nice initlog -c "$*" 2>&1 </dev/null
+	fi
+}
+
 # A function to start a program (now it's useful on read-only filesystem too)
 daemon() {
-	local errors="" prog="" end="" waitname="" waittime=""
+	local errors="" waitname="" waittime=0
 	local exit_code=0
 	local nice=$SERVICE_RUN_NICE_LEVEL
 	local fork user closefds redirfds pidfile makepid chdir=/
 
-	# NOTE: if you wonder how the shellish (by syntax) $prog works in ssd mode,
-	# then the answer is: it totally ignores $prog and uses "$@" itself.
-
 	while [ $# -gt 0 ]; do
 		case $1 in
 		'')
@@ -644,7 +706,6 @@ daemon() {
 			;;
 		--fork)
 			fork=1
-			end='&'
 			;;
 		--chdir)
 			shift
@@ -675,6 +736,8 @@ daemon() {
 			;;
 		--makepid)
 			makepid=1
+			# makepid implies fork
+			fork=1
 			;;
 		-*|+*)
 			nice=$1
@@ -687,19 +750,6 @@ daemon() {
 		esac
 		shift
 	done
-	if [ -n "$user" -a "$user" != "root" ]; then
-		prog="/bin/su $user -s /bin/sh -c \""
-	fi
-	if [ "$fork" = "1" ]; then
-		prog="/usr/bin/setsid ${prog:-sh -c \"}"
-	fi
-	# If command to execute ends with quotation mark, add remaining
-	# arguments and close quotation.
-	if [ "$prog" != "${prog%\"}" ]; then
-		prog="$prog $*$end\""
-	else
-		prog="$prog $*$end"
-	fi
 
 	_daemon_set_ulimits
 
@@ -710,67 +760,7 @@ daemon() {
 	busy
 	cd $chdir
 	[ -n "$SERVICE_CPUSET" ] && is_yes "$CPUSETS" && echo $$ > "/dev/cpuset/${SERVICE_CPUSET}/tasks"
-	if errors=$(
-		umask ${SERVICE_UMASK:-$DEFAULT_SERVICE_UMASK};
-		export USER=root HOME=/tmp TMPDIR=/tmp
-
-		nice=${nice:-$DEFAULT_SERVICE_RUN_NICE_LEVEL}
-		nice=${nice:-0}
-
-		# make nice level absolute, not to be dependant of nice level of shell where service started
-		nice=$(($nice - $(nice)))
-
-		if [ "$closefds" = 1 ]; then
-			exec 1>&-
-			exec 2>&-
-			exec 0<&-
-		elif [ "$redirfds" = 1 ]; then
-			exec 1>/dev/null
-			exec 2>/dev/null
-			exec 0</dev/null
-		else
-			exec 2>&1
-			exec 0</dev/null
-		fi
-
-		if is_no "$RC_LOGGING"; then
-			prog=$1; shift
-			if [ ! -x $prog ]; then
-				logger -t rc-scripts -p daemon.debug "daemon: Searching PATH for $prog, consider using full path in initscript"
-				local a o=$IFS
-				IFS=:
-				for a in $PATH; do
-					if [ -x $a/$prog ]; then
-						prog=$a/$prog
-						break
-					fi
-				done
-				IFS=$o
-			fi
-			set -- "$prog" "$@"
-
-			# use setsid to detach from terminal,
-			# needs pidfile or ssd would check setsid program instead of real program
-			if [ "$pidfile" ]; then
-				set -- /usr/bin/setsid "$@"
-			fi
-
-			prog=$1; shift
-			/sbin/start-stop-daemon -q --start \
-				--nicelevel $nice \
-				${pidfile:+--pidfile $pidfile} \
-				${makepid:+--make-pidfile} \
-				${user:+--chuid $user} \
-				${chdir:+--chdir "$chdir"} \
-				${fork:+--background} \
-				${SERVICE_DROPCAPS:+--dropcap $SERVICE_DROPCAPS} \
-				--exec "$prog" \
-				-- "$@"
-		else
-			nice -n $nice initlog -c "$prog" 2>&1 </dev/null
-		fi
-		); then
-
+	if errors=$(_daemon_exec "$@"); then
 		# wait for process (or pidfile) to be created
 		if [ "$waittime" -gt 0 ]; then
 			# waitname can be empty, as if pidfile is in use, it is not relevant
@@ -991,10 +981,12 @@ 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
-	if [ -z "$pid" ] && [ -z "$pidfile" ]; then
+	if [ -z "$pid" ] && [ -z "$2" ]; then
 		pid=$(pidof -o $$ -o $PPID -o %PPID -x "$1")
 	fi
 
@@ -1321,35 +1313,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