From 0d349b3a5a29990a637a2002e7cf68e8d2427b08 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Sat, 23 Feb 2008 10:48:22 +0000
Subject: [PATCH] Improve ganeti example cron file
The cron file in ganeti's example directory is now static, and executes
ganeti-watcher in /usr/local/sbin no matter where it's really installed. With
this patch we generate it at build time substituting the right value of
@SBINDIR@ from ganeti.cron.in. We also make sure ganeti-watcher exists and is
executable before running it.
This is targeted at 1.2 as well.
Reviewed-by: iustinp
---
doc/examples/Makefile.am | 9 +++++----
doc/examples/{ganeti.cron => ganeti.cron.in} | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
rename doc/examples/{ganeti.cron => ganeti.cron.in} (54%)
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 5ed18ec5a..427bad914 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,12 +1,13 @@
-EXTRA_DIST = ganeti.initd.in ganeti.cron
+EXTRA_DIST = ganeti.initd.in ganeti.cron.in
CLEANFILES = $(nodist_EXTRA_DATA)
-nodist_EXTRA_DATA = ganeti.initd
+nodist_EXTRA_DATA = ganeti.initd ganeti.cron
-all-local: ganeti.initd
-ganeti.initd: ganeti.initd.in
+all-local: ganeti.initd ganeti.cron
+ganeti.%: ganeti.%.in
sed \
-e "s#@PREFIX@#$(prefix)#g" \
-e "s#@SYSCONFDIR@#$(sysconfdir)#g" \
-e "s#@LOCALSTATEDIR@#$(localstatedir)#g" \
+ -e "s#@SBINDIR@#$(sbindir)#g" \
< $< > $@
diff --git a/doc/examples/ganeti.cron b/doc/examples/ganeti.cron.in
similarity index 54%
rename from doc/examples/ganeti.cron
rename to doc/examples/ganeti.cron.in
index 813c28406..155411a5c 100644
--- a/doc/examples/ganeti.cron
+++ b/doc/examples/ganeti.cron.in
@@ -1,3 +1,3 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
# restart failed instances
-*/5 * * * * root /usr/local/sbin/ganeti-watcher
+*/5 * * * * root [ -x @SBINDIR@/ganeti-watcher ] && @SBINDIR@/ganeti-watcher
--
GitLab