config: chdir_root on by default

diff --git a/src/config.cc b/src/config.cc
index 0faf8681e33faa7986f22e4f8e0029785955a533..3c5a1ec7a325dbc3c285dfbac95177ee67bdf917 100644 (file)
--- 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 64cb1a47e56c763ce8941aa3e6b1d37710cb13ca..da8df5cdd15c3557c9e26cb7ae8a85f711beac79 100644 (file)
--- 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 9955af2af7c3f2523d091ef782102ed3264c480b..7c2755923761fb3168293bef40d7f608da448033 100644 (file)
--- 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