do not hardcode py version

[packages/ganeti.git] / systemd.patch

diff --git a/systemd.patch b/systemd.patch
index b2cf51f04267d08e8137e1d92486248fef2c093f..886c710915f8a28d1a8d8e0fc653a2985ac985c0 100644 (file)
--- 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,15 +53,15 @@ 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
-+User=@GNTNODEDUSER@
-+Group=@GNTDAEMONSGROUP@
++User=@GNTMASTERUSER@
++Group=@GNTMASTERDGROUP@
 +PIDFile=@LOCALSTATEDIR@/run/ganeti/ganeti-masterd.pid
 +# TODO: Should KillMode be process?
 +KillMode=control-group
@@ -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