Merge pull request #1137 from yuusuke/fix_startup_scripts

Improvement to load the correct sysconf
ClusterLabs · Aug 31, 2016 · 4637a75 · 4637a75
2 parents b53e9fc + 8438e6f
commit 4637a75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mcp/pacemaker.combined.upstart.in b/mcp/pacemaker.combined.upstart.in
@@ -10,7 +10,7 @@ kill timeout 3600
 respawn
 
 env prog=pacemakerd
-env sysconf=@CONFIGDIR@/crm_mon
+env sysconf=@CONFIGDIR@/pacemaker
 env rpm_lockdir=@localstatedir@/lock/subsys
 env deb_lockdir=@localstatedir@/lock
 

diff --git a/mcp/pacemaker.upstart.in b/mcp/pacemaker.upstart.in
@@ -7,7 +7,7 @@ kill timeout 3600
 respawn
 
 env prog=pacemakerd
-env sysconf=@CONFIGDIR@/crm_mon
+env sysconf=@CONFIGDIR@/pacemaker
 env rpm_lockdir=@localstatedir@/lock/subsys
 env deb_lockdir=@localstatedir@/lock