[sheepdog] [PATCH] fix systemd support on CentOS/RHEL 7

[Vladislav Gorbunov]

Shell command ${SHEEP_OPTS:-"--cluster local --log dst=syslog --upgrade
/var/lib/sheepdog"} didn't work on my systemd version 208
release 11.el7_0.4.

systemctl start sheepdog didn't start:
sheepdog.service - Sheepdog QEMU/KVM Block Storage
   Loaded: loaded (/usr/lib/systemd/system/sheepdog.service; enabled)
   Active: failed (Result: resources) since Чт 2014-11-27 00:32:33 MAGT;
2min 24s ago
  Process: 29664 ExecStart=/usr/sbin/sheep --pidfile /var/run/sheep.pid
${SHEEP_OPTS:-"--cluster local --log dst=syslog - -upgrade
/var/lib/sheepdog"} (code=exited, status=0/SUCCESS)
 Main PID: 29109 (code=exited, status=1/FAILURE)

But ExecStart=/usr/sbin/sheep --pidfile /var/run/sheep.pid $SHEEP_OPTS just
work. Here is the patch:

diff --git a/script/sheepdog.service.in b/script/sheepdog.service.in
index 555083e..6a1c5bb 100644
--- a/script/sheepdog.service.in
+++ b/script/sheepdog.service.in
@@ -7,7 +7,7 @@ Wants=syslog.target
 EnvironmentFile=- at SYSCONFDIR@/conf.d/sheepdog.conf
 EnvironmentFile=- at SYSCONFDIR@/sysconfig/sheepdog
 EnvironmentFile=- at SYSCONFDIR@/default/sheepdog
-ExecStart=@SBINDIR@/sheep --pidfile @LOCALSTATEDIR@/run/sheep.pid
${SHEEP_OPTS:-"--cluster local --log syslog --pidfile
@LOCALSTATEDIR@/run/sheep.pid --upgrade @LOCALSTATEDIR@/lib/sheepdog"}
+ExecStart=@SBINDIR@/sheep --pidfile @LOCALSTATEDIR@/run/sheep.pid $SHEEP_OPTS
 PIDFile=@LOCALSTATEDIR@/run/sheep.pid
 Type=forking


2014-11-26 19:36 GMT+10:00 Vasiliy Tolstov <v.tolstov at selfip.ru>:

> 2014-11-26 12:29 GMT+03:00 Vladislav Gorbunov <vadikgo at gmail.com>:
> > Hello.
> > In sheepdog 0.9 parameter --log syslog will not work. Need to set:
> > --log dst=syslog
> > and remove --pidfile @LOCALSTATEDIR@/run/sheep.pid duplicate.
>
>
> Ok. Can you rewrite patch to correct only this issues?
>
> --
> Vasiliy Tolstov,
> e-mail: v.tolstov at selfip.ru
> jabber: vase at selfip.ru
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.wpkg.org/pipermail/sheepdog/attachments/20141127/a11aad9c/attachment-0004.html>