[packages/rc-scripts.git] / rc-scripts-git.patch

diff --git a/lib/functions b/lib/functions
index 8d018f7..f9538d2 100644
--- a/lib/functions
+++ b/lib/functions
@@ -690,13 +690,12 @@ _daemon_exec() {
 			--exec "$prog" \
 			-- "$@"
 	else
-
-		if [ "$makepid" ] && [ "$pidfile" ]; then
-			export PIDFILE="$pidfile"
-			set -- /lib/rc-scripts/makepid "$@"
-		fi
-
 		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
@@ -1009,7 +1008,7 @@ pidofproc() {
 	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
 
commit bf42a4fb7c71c31954499bf9cbce4548305afe80
Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date:   Tue Jun 7 17:09:48 2016 +0200

    Mount /run as mode=0755,noexec,nosuid,nodev.

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index f7f0eea..99bb078 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -409,7 +409,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
 	parse_cmdline
 
 	if [ -d /run ]; then
-		is_fsmounted tmpfs /run || mount -n -t tmpfs run /run
+		is_fsmounted tmpfs /run || mount -n -t tmpfs run /run -o mode=0755,noexec,nosuid,nodev
 	fi
 
 	# Early sysctls
@@ -680,7 +680,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
 		mount -f -t devtmpfs devtmpfs /dev 2> /dev/null
 	fi
 	if is_fsmounted tmpfs /run; then
-		mount -f -t tmpfs run /run 2> /dev/null
+		mount -f -t tmpfs run /run -o mode=0755,noexec,nosuid,nodev 2> /dev/null
 	fi
 
 	if is_fsmounted usbfs /proc/bus/usb; then
Commit	Line	Data
	1	diff --git a/lib/functions b/lib/functions
	2	index 8d018f7..f9538d2 100644
	3	--- a/lib/functions
	4	+++ b/lib/functions
	5	@@ -690,13 +690,12 @@ _daemon_exec() {
	6	--exec "$prog" \
	7	-- "$@"
	8	else
	9	-
	10	- if [ "$makepid" ] && [ "$pidfile" ]; then
	11	- export PIDFILE="$pidfile"
	12	- set -- /lib/rc-scripts/makepid "$@"
	13	- fi
	14	-
	15	if [ "$fork" = "1" ]; then
	16	+ export PIDFILE="/dev/null"
	17	+ if [ "$makepid" ] && [ "$pidfile" ]; then
	18	+ export PIDFILE="$pidfile"
	19	+ fi
	20	+ set -- /lib/rc-scripts/makepid "$@"
	21	set -- /usr/bin/setsid "$@"
	22	fi
	23	if [ -n "$user" -a "$user" != "root" ]; then
	24	@@ -1009,7 +1008,7 @@ pidofproc() {
	25	fi
	26
	27	# Next try "pidof" if pidfile is not specified
	28	- if [ -z "$pid" ] && [ -z "$pidfile" ]; then
	29	+ if [ -z "$pid" ] && [ -z "$2" ]; then
	30	pid=$(pidof -o $$ -o $PPID -o %PPID -x "$1")
	31	fi
	32
	33	commit bf42a4fb7c71c31954499bf9cbce4548305afe80
	34	Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
	35	Date: Tue Jun 7 17:09:48 2016 +0200
	36
	37	Mount /run as mode=0755,noexec,nosuid,nodev.
	38
	39	diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
	40	index f7f0eea..99bb078 100755
	41	--- a/rc.d/rc.sysinit
	42	+++ b/rc.d/rc.sysinit
	43	@@ -409,7 +409,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
	44	parse_cmdline
	45
	46	if [ -d /run ]; then
	47	- is_fsmounted tmpfs /run \|\| mount -n -t tmpfs run /run
	48	+ is_fsmounted tmpfs /run \|\| mount -n -t tmpfs run /run -o mode=0755,noexec,nosuid,nodev
	49	fi
	50
	51	# Early sysctls
	52	@@ -680,7 +680,7 @@ if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
	53	mount -f -t devtmpfs devtmpfs /dev 2> /dev/null
	54	fi
	55	if is_fsmounted tmpfs /run; then
	56	- mount -f -t tmpfs run /run 2> /dev/null
	57	+ mount -f -t tmpfs run /run -o mode=0755,noexec,nosuid,nodev 2> /dev/null
	58	fi
	59
	60	if is_fsmounted usbfs /proc/bus/usb; then