- final, I hope, systemd services ordering fixes

[packages/ganeti.git] / systemd.patch

diff --git a/systemd.patch b/systemd.patch
index 8832a2410fe642d56fb75893623454a773ee6231..4a550d67decd610762393c9f145a19b7314da480 100644 (file)
--- a/systemd.patch
+++ b/systemd.patch
@@ -31,8 +31,8 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti Confd
-+Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
-+After=ganeti-rapi.service
++Requires=ganeti-noded.service
++After=ganeti-noded.service ganeti-rapi.service
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
@@ -49,7 +49,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,19 @@
+@@ -0,0 +1,20 @@
 +[Unit]
 +Description=Ganeti Masterd
 +Requires=ganeti-noded.service
@@ -59,6 +59,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Service]
 +Type=forking
 +EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=/bin/sh -c '[ "$(cat @LOCALSTATEDIR@/lib/ganeti/ssconf_master_node 2>/dev/null)" = "$(hostname -f 2>/dev/null)" ]'
 +ExecStartPre=/usr/bin/sudo @PKGLIBDIR@/ensure-dirs
 +ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS
 +User=@GNTMASTERUSER@
@@ -93,8 +94,8 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 @@ -0,0 +1,18 @@
 +[Unit]
 +Description=Ganeti RAPI
-+Requires=ganeti-noded.service
-+After=ganeti-masterd.service
++Requires=ganeti-noded.service ganeti-masterd.service
++After=ganeti-noded.service ganeti-masterd.service
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
@@ -115,7 +116,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Unit]
 +Description=Ganeti luxid
 +Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
-+After=ganeti-rapi.service
++After=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service ganeti-confd.service
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]
@@ -136,7 +137,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
 +[Unit]
 +Description=Ganeti mond
 +Requires=ganeti-noded.service
-+After=ganeti-rapi.service ganeti-masterd.service
++After=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
 +ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
 +
 +[Service]