Change default configuration file to /etc/booth/booth.conf

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>
jjzhang · Mar 10, 2012 · 91a2b5a · 91a2b5a
1 parent b048855
commit 91a2b5a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/conf/booth.conf.example b/conf/booth.conf.example
@@ -1,4 +1,4 @@
-# The booth configuration file is "/etc/sysconfig/booth". You need to
+# The booth configuration file is "/etc/booth/booth.conf". You need to
 # prepare the same booth configuration file on each arbitrator and
 # each node in the cluster sites where the booth daemon can be launched.
 # Here is an example of the configuration file:

diff --git a/script/lsb/booth-arbitrator b/script/lsb/booth-arbitrator
@@ -24,8 +24,6 @@ exec="/usr/sbin/$prog"
 type="arbitrator"
 lockfile="/var/run/booth.pid"
 
-[ -f /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
 . /etc/rc.status
 
 internal_status() {

diff --git a/src/booth.h b/src/booth.h
@@ -29,7 +29,7 @@
 #define BOOTH_LOG_DIR "/var/log"
 #define BOOTH_LOGFILE_NAME "booth.log"
 #define BOOTH_DEFAULT_LOCKFILE BOOTH_RUN_DIR "/booth.pid"
-#define BOOTH_DEFAULT_CONF "/etc/sysconfig/booth"
+#define BOOTH_DEFAULT_CONF "/etc/booth/booth.conf"
 
 #define DAEMON_NAME		"booth"
 #define BOOTH_NAME_LEN		63

diff --git a/test/boothrunner.py b/test/boothrunner.py
@@ -6,7 +6,7 @@
 import unittest
 
 class BoothRunner:
-    default_config_file = '/etc/sysconfig/booth'
+    default_config_file = '/etc/booth/booth.conf'
     default_lock_file   = '/var/run/booth.pid'
 
     def __init__(self, boothd_path, mode, args):