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 <o...@aepfle.de> Signed-off-by: George Dunlap <george.dun...@citrix.com> --- 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 <ian.campb...@citrix.com> CC: Ian Jackson <ian.jack...@citrix.com> CC: Wei Liu <wei.l...@citrix.com> CC: Olaf Hering <o...@aepfle.de> --- 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
