diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2016-09-20 11:23:46 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2016-09-20 11:33:56 -0500 |
| commit | d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4 (patch) | |
| tree | edaf942728c0bf7b72b2bfe5bf168830645a76ff | |
| parent | 0d1f1010c299a95332f224c3be9e8dfdd85eec54 (diff) | |
| download | openrc-d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4.tar.xz | |
Revert "Remove eval calls from supervisor start functions"
This reverts commit 0d1f1010c299a95332f224c3be9e8dfdd85eec54.
We need the eval in case someone uses something like:
command_args="this \"is a\" test"
This is related to #77.
| -rw-r--r-- | sh/start-stop-daemon.sh | 5 | ||||
| -rw-r--r-- | sh/supervise-daemon.sh | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh index 0449e5b6..0793b19a 100644 --- a/sh/start-stop-daemon.sh +++ b/sh/start-stop-daemon.sh @@ -38,7 +38,10 @@ ssd_start() service_inactive && _inactive=true mark_service_inactive fi - start-stop-daemon --start \ + #the eval call is necessary for cases like: + # command_args="this \"is a\" test" + # to work properly. + eval start-stop-daemon --start \ --exec $command \ ${chroot:+--chroot} $chroot \ ${procname:+--name} $procname \ diff --git a/sh/supervise-daemon.sh b/sh/supervise-daemon.sh index 389635f6..bff68a4c 100644 --- a/sh/supervise-daemon.sh +++ b/sh/supervise-daemon.sh @@ -19,7 +19,10 @@ supervise_start() fi ebegin "Starting ${name:-$RC_SVCNAME}" - supervise-daemon --start \ + # The eval call is necessary for cases like: + # command_args="this \"is a\" test" + # to work properly. + eval supervise-daemon --start \ ${chroot:+--chroot} $chroot \ ${pidfile:+--pidfile} $pidfile \ ${command_user+--user} $command_user \ |