mon: fix init sequence when not daemonizing

We made the common_init_finish and chdir conditional on daemonize in commit
2e0dd5ae6c8751e33d456b2b06c1204b63db959a, breaking init (asok at least)
when -f is specified (as with upstart).

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 0189a319b5dfadd521b63eceab0e0bb1d17868e6..28e897e961a976919ac73c955dbecbd10eb85ec8 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -283,9 +283,9 @@ int main(int argc, const char **argv)
       return prefork.parent_wait();
     }
     global_init_postfork(g_ceph_context, 0);
-    common_init_finish(g_ceph_context);
-    global_init_chdir(g_ceph_context);
   }
+  common_init_finish(g_ceph_context);
+  global_init_chdir(g_ceph_context);
 
   {
     Monitor::StoreConverter converter(g_conf->mon_data);