- startup script/services cleanup

[packages/ganeti.git] / systemd.patch

diff --git a/systemd.patch b/systemd.patch
index 058394e6b76b59fea2350dba1f4fb9170c581055..b415fece7dad363c3f90825560d99cc6cfe3bfde 100644 (file)
--- a/systemd.patch
+++ b/systemd.patch
@@ -25,7 +25,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
        $(BUILT_PYTHON_SOURCES)
 --- ganeti-2.6.2/doc/examples.orig/ganeti-confd.service.in     1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/ganeti-confd.service.in  2013-06-01 15:55:37.594893846 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti Confd
 +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
@@ -35,6 +35,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Type=forking
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-confd $CONFD_ARGS
 +User=@GNTCONFDUSER@
 +Group=@GNTCONFDGROUP@
@@ -45,7 +46,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +WantedBy=ganeti.target
 --- ganeti-2.6.2/doc/examples.orig/ganeti-masterd.service.in   1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/ganeti-masterd.service.in        2013-06-01 15:55:37.611560663 +0200
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,19 @@
 +[Unit]
 +Description=Ganeti Masterd
 +Requires=ganeti-noded.service
@@ -55,6 +56,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Type=forking
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS
 +User=@GNTNODEDUSER@
 +Group=@GNTDAEMONSGROUP@
@@ -66,7 +68,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +WantedBy=ganeti.target
 --- ganeti-2.6.2/doc/examples.orig/ganeti-noded.service.in     1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/ganeti-noded.service.in  2013-06-01 15:55:37.631560853 +0200
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,16 @@
 +[Unit]
 +Description=Ganeti Noded
 +
@@ -74,6 +76,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Type=forking
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-noded $NODED_ARGS
 +User=@GNTNODEDUSER@
 +Group=@GNTDAEMONSGROUP@
@@ -84,7 +87,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +WantedBy=ganeti.target
 --- ganeti-2.6.2/doc/examples.orig/ganeti-rapi.service.in      1970-01-01 01:00:00.000000000 +0100
 +++ ganeti-2.6.2/doc/examples/ganeti-rapi.service.in   2013-06-01 15:55:37.644894309 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti RAPI
 +Requires=ganeti-noded.service ganeti-masterd.service
@@ -94,6 +97,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +Type=forking
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-rapi $RAPI_ARGS
 +User=@GNTRAPIUSER@
 +Group=@GNTRAPIGROUP@