emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Remove eval calls from supervisor start functions"

Browse Source 
This reverts commit 0d1f1010c2.
We need the eval in case someone uses something like:
command_args="this \"is a\" test"

This is related to #77.
This commit is contained in:
William Hubbs 2016-09-20 11:23:46 -05:00
parent 0d1f1010c2
commit d6c30ab12a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sh/start-stop-daemon.sh
View File

@ -38,7 +38,10 @@ ssd_start()
service_inactive && _inactive=true service_inactive && _inactive=true
mark_service_inactive mark_service_inactive
fi 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 \ --exec $command \
${chroot:+--chroot} $chroot \ ${chroot:+--chroot} $chroot \
${procname:+--name} $procname \ ${procname:+--name} $procname \

5
sh/supervise-daemon.sh
View File

@ -19,7 +19,10 @@ supervise_start()
fi fi
ebegin "Starting ${name:-$RC_SVCNAME}" 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 \ ${chroot:+--chroot} $chroot \
${pidfile:+--pidfile} $pidfile \ ${pidfile:+--pidfile} $pidfile \
${command_user+--user} $command_user \ ${command_user+--user} $command_user \