From 1a67f7b3ac3c035d6e4b2181fbad903aa4b03711 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 3 May 2013 16:20:26 -0700 Subject: [PATCH] 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 Reviewed-by: Greg Farnum --- src/ceph_mon.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 0189a319b5dfa..28e897e961a97 100644 --- 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); -- 2.39.5