From 700af1fed96f73acca113caec6bd95aa22a2b02e Mon Sep 17 00:00:00 2001 From: ajacoutot <> Date: Sun, 20 Jan 2019 04:52:07 +0000 Subject: [PATCH] The shell will strip the quotes from daemon_flags when starting a daemon so make sure pexp matches the process (i.e. doesn't include the quotes). It's a bit hackish but it allows things like these in rc.conf.local: relayd_flags=-D IPS="1.2.3.4 2.3.4.5" And we properly end up with... $ grep ^pexp /var/run/rc.d/relayd pexp=/usr/sbin/relayd -D IPS=1.2.3.4 1.2.3.5 ... which matches what is in the process list: root 14217 0:00.01 /usr/sbin/relayd -D IPS=1.2.3.4 1.2.3.5 There's always the possibility that we have introduced a regressions with hand crafted functions in rc.d scripts (mostly from packags), so watch out. reported by and debugged with claudio@ --- src/etc/rc.d/rc.subr | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr index 0d887b20..8b414160 100644 --- a/src/etc/rc.d/rc.subr +++ b/src/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.129 2018/10/29 07:55:40 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.130 2019/01/20 04:52:07 ajacoutot Exp $ # # Copyright (c) 2010, 2011, 2014-2017 Antoine Jacoutot # Copyright (c) 2010, 2011 Ingo Schwarze @@ -316,7 +316,9 @@ fi readonly daemon_class unset _rcflags _rcrtable _rcuser _rctimeout -pexp="${daemon}${daemon_flags:+ ${daemon_flags}}" +# the shell will strip the quotes from daemon_flags when starting a daemon; +# make sure pexp matches the process (i.e. doesn't include the quotes) +pexp="$(eval echo ${daemon}${daemon_flags:+ ${daemon_flags}})" rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c" [ "${daemon_rtable}" -eq 0 ] || rcexec="route -T ${daemon_rtable} exec ${rcexec}"