From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A156F138330 for ; Tue, 20 Sep 2016 16:36:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44FF5E0B91; Tue, 20 Sep 2016 16:36:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FF47E0B91 for ; Tue, 20 Sep 2016 16:36:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2602033BF44 for ; Tue, 20 Sep 2016 16:36:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DBC5246F for ; Tue, 20 Sep 2016 16:36:08 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1474389236.d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/start-stop-daemon.sh sh/supervise-daemon.sh X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4 X-VCS-Branch: master Date: Tue, 20 Sep 2016 16:36:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 535c6dc4-3802-46d7-9f39-e2390c371a81 X-Archives-Hash: 9494a32cc65c1b7c5fc5d74941ad4c6e commit: d6c30ab12a3b335ac57cd1f0ac00231bb34fc0c4 Author: William Hubbs gmail com> AuthorDate: Tue Sep 20 16:23:46 2016 +0000 Commit: William Hubbs gentoo 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 \