From: Sage Weil <sage@newdream.net>
Date: Sat, 28 Feb 2009 23:52:18 +0000 (-0800)
Subject: config: chdir_root on by default
X-Git-Tag: v0.7~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7a42ba386c577c967988d8ee4e0e916b5d05301;p=ceph.git

config: chdir_root on by default
---

diff --git a/src/config.cc b/src/config.cc
index 0faf8681e33f..3c5a1ec7a325 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -217,6 +217,8 @@ md_config_t g_conf = {
   conf_file: INSTALL_PREFIX "/etc/ceph/ceph.conf",
 
   dump_conf: false,
+
+  chdir_root: true,  // chdir("/") after daemonizing. if true, we generate absolute paths as needed.
   
   fake_clock: false,
   fakemessenger_serialize: true,
@@ -254,9 +256,6 @@ md_config_t g_conf = {
   
   debug_after: 0,
   
-  // -- misc --
-  chdir_root: false,
-
   // --- clock ---
   clock_lock: false,
   clock_tare: false,
@@ -642,6 +641,7 @@ void parse_config_file(ConfFile *cf, bool auto_update)
   CF_READ_STR("global", "dout sym dir", dout_sym_dir);
   CF_READ_STR("global", "logger dir", logger_dir);
   CF_READ_STR("global", "pid file", pid_file);
+  CF_READ("global", "chdir root", chdir_root);
 
   CF_READ("debug", "debug", debug);
   CF_READ("debug", "lockdep", debug_lockdep);
@@ -658,7 +658,6 @@ void parse_config_file(ConfFile *cf, bool auto_update)
   CF_READ("debug", "ms", debug_ms);
   CF_READ("debug", "mon", debug_mon);
   CF_READ("debug", "tp", debug_tp);
-  CF_READ("debug", "chdir root", chdir_root);
 
   CF_READ("clock", "lock", clock_lock);
   CF_READ("clock", "tare", clock_tare);
diff --git a/src/config.h b/src/config.h
index 64cb1a47e56c..da8df5cdd15c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -70,6 +70,8 @@ struct md_config_t {
   const char *conf_file;
   bool dump_conf;
 
+  bool chdir_root;
+
   bool fake_clock;
   bool fakemessenger_serialize;
 
@@ -106,9 +108,6 @@ struct md_config_t {
 
   int debug_after;
 
-  // misc
-  bool chdir_root;
-
   // clock
   bool clock_lock;
   bool clock_tare;
diff --git a/src/workingdir.conf b/src/workingdir.conf
index 9955af2af7c3..7c2755923761 100644
--- a/src/workingdir.conf
+++ b/src/workingdir.conf
@@ -6,3 +6,4 @@
 	dout dir = out
 	dout sym dir = out
 	logger dir = log
+	chdir root = false
\ No newline at end of file