From mboxrd@z Thu Jan 1 00:00:00 1970 From: George Dunlap Subject: [PATCH] tools/hotplug: Use env rather than sh in xenstored.service Date: Tue, 15 Sep 2015 11:30:00 +0100 Message-ID: <1442313000-5576-1-git-send-email-george.dunlap@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Wei Liu , Ian Campbell , George Dunlap , George Dunlap , Ian Jackson List-Id: xen-devel@lists.xenproject.org Using sh to exec xenstored breaks on selinux systems (at least, on CentOS 7). The only purpose of doing that was to be able to expand the $XENSTORED variable; this can be done with /usr/bin/env instead, which still works on systemd systems (at least on CentOS 7). Suggested-by: Olaf Hering Signed-off-by: George Dunlap --- One could argue that this is a bug in 4.6 and should be accepted. I could also see an argument, however, that this late in the cycle we should just wait until 4.6.1. I'll leave it up to Wei to decide. CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Olaf Hering --- tools/hotplug/Linux/systemd/xenstored.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index a5f836b..09964f3 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -15,7 +15,7 @@ EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb* ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ -ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS" +ExecStart=/usr/bin/env $XENSTORED --no-fork $XENSTORED_ARGS [Install] WantedBy=multi-user.target -- 1.9.1