From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 2 Nov 2013 16:28:58 +0000 (+0100)
Subject: - fix systemd service files
X-Git-Tag: auto/th/ganeti-2.9.3-1~25
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fganeti.git;a=commitdiff_plain;h=0a985774962dc8a6dae83cf56b7a0190a579fee2

- fix systemd service files
---

diff --git a/ganeti.spec b/ganeti.spec
index a96fe08..7479f8e 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -1,7 +1,7 @@
 Summary:	Cluster-based virtualization management software
 Name:		ganeti
 Version:	2.8.1
-Release:	0.2
+Release:	0.3
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
diff --git a/systemd.patch b/systemd.patch
index b2cf51f..c18f5d8 100644
--- a/systemd.patch
+++ b/systemd.patch
@@ -32,10 +32,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Description=Ganeti Confd
 +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
 +After=ganeti-rapi.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-confd $CONFD_ARGS
@@ -53,10 +53,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Description=Ganeti Masterd
 +Requires=ganeti-noded.service
 +After=ganeti-noded.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS
@@ -73,10 +73,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,16 @@
 +[Unit]
 +Description=Ganeti Noded
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-noded $NODED_ARGS
@@ -94,10 +94,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Description=Ganeti RAPI
 +Requires=ganeti-noded.service ganeti-masterd.service
 +After=ganeti-masterd.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-rapi $RAPI_ARGS
@@ -115,10 +115,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Description=Ganeti luxid
 +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
 +After=ganeti-rapi.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-luxid $LUXID_ARGS
@@ -136,10 +136,10 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Description=Ganeti mond
 +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
 +After=ganeti-rapi.service
++ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
 +Type=forking
-+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
 +ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-mond $MOND_ARGS