summaryrefslogtreecommitdiff
path: root/etc/rc.d
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2018-10-29 07:55:42 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2018-10-29 07:55:42 +0000
commitb76b578464deba1e2623161697963af1a74fe8d9 (patch)
treee5bac91eec864b71a30a26cd26093b6786f35276 /etc/rc.d
parent988299537c9d3877675d78086ff3cd41c78af866 (diff)
Revert previous (for now).
semarie found a few regressions with daemon that will fail if cwd is not accessible.
Diffstat (limited to 'etc/rc.d')
-rw-r--r--etc/rc.d/rc.subr4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index f5547aa7878..0d887b203de 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.128 2018/10/16 07:07:05 ajacoutot Exp $
+# $OpenBSD: rc.subr,v 1.129 2018/10/29 07:55:40 ajacoutot Exp $
#
# Copyright (c) 2010, 2011, 2014-2017 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -317,6 +317,6 @@ fi
readonly daemon_class
unset _rcflags _rcrtable _rcuser _rctimeout
pexp="${daemon}${daemon_flags:+ ${daemon_flags}}"
-rcexec="env -i HOME=/ su -m -c ${daemon_class} -s /bin/sh ${daemon_user} -c"
+rcexec="su -l -c ${daemon_class} -s /bin/sh ${daemon_user} -c"
[ "${daemon_rtable}" -eq 0 ] ||
rcexec="route -T ${daemon_rtable} exec ${rcexec}"