commit:     d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Sep 20 16:23:46 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 16:33:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d6c30ab1

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.

 sh/start-stop-daemon.sh | 5 ++++-
 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 0449e5b..0793b19 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 389635f..bff68a4 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 \

Reply via email to