From c1671c0e2c1f5ac79bf09d37a90767480ae6372f Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 4 Sep 2007 15:27:01 +0000
Subject: [PATCH] Use configure's paths in the init script example.
Reviewed-by: schreiberal
---
doc/examples/Makefile.am | 12 +++++++++++-
doc/examples/{ganeti.initd => ganeti.initd.in} | 15 +++++++++------
2 files changed, 20 insertions(+), 7 deletions(-)
rename doc/examples/{ganeti.initd => ganeti.initd.in} (87%)
mode change 100755 => 100644
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index ba9b3a726..667567de9 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1 +1,11 @@
-EXTRA_DIST = ganeti.initd ganeti.cron
+nodist_bin_SCRIPTS = ganeti.initd
+
+EXTRA_DIST = ganeti.initd.in ganeti.cron
+CLEANFILES = $(nodist_bin_SCRIPTS)
+
+ganeti.initd: ganeti.initd.in
+ sed \
+ -e "s#@PREFIX@#$(prefix)#g" \
+ -e "s#@SYSCONFDIR@#$(sysconfdir)#g" \
+ -e "s#@LOCALSTATEDIR@#$(localstatedir)#g" \
+ < $< > $@
diff --git a/doc/examples/ganeti.initd b/doc/examples/ganeti.initd.in
old mode 100755
new mode 100644
similarity index 87%
rename from doc/examples/ganeti.initd
rename to doc/examples/ganeti.initd.in
index 25327ab4a..9faba7302
--- a/doc/examples/ganeti.initd
+++ b/doc/examples/ganeti.initd.in
@@ -1,20 +1,23 @@
-#! /bin/sh
+#!/bin/sh
# ganeti node daemon starter script
# based on skeleton from Debian GNU/Linux
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-NODED=/usr/local/sbin/ganeti-noded
-MASTER=/usr/local/sbin/ganeti-master
-NAME=ganeti-noded
-SCRIPTNAME=/etc/init.d/ganeti
DESC="Ganeti cluster"
+NAME=ganeti-noded
+NODED=@PREFIX@/sbin/ganeti-noded
+MASTER=@PREFIX@/sbin/ganeti-master
+SCRIPTNAME=@SYSCONFDIR@/init.d/ganeti
test -f $NODED || exit 0
. /lib/lsb/init-functions
check_config() {
- for fname in /var/lib/ganeti/ssconf_node_pass /var/lib/ganeti/server.pem; do
+ for fname in \
+ "@LOCALSTATEDIR@/lib/ganeti/ssconf_node_pass" \
+ "@LOCALSTATEDIR@/lib/ganeti/server.pem"
+ do
if ! [ -f "$fname" ]; then
log_end_msg 0
log_warning_msg "Config $fname not there, will not run."
--
GitLab