diff --git a/main.c b/main.c index 09b7fe969..2f25c2305 100644 --- a/main.c +++ b/main.c @@ -124,6 +124,8 @@ int main(int argc, char *argv[]) } } + core_initialize(); + if (opt_daemon) { pid_t pid; @@ -142,8 +144,6 @@ int main(int argc, char *argv[]) umask(027); } - core_initialize(); - if (opt_logger) { pid_t pid; @@ -166,8 +166,6 @@ int main(int argc, char *argv[]) /* Parent */ } - signal_init(); - { pid_t pid; pid = fork(); @@ -199,6 +197,8 @@ int main(int argc, char *argv[]) d_trace_level(&_s1ap_path, 100); } + signal_init(); + if (cellwire_initialize(config_path) != CORE_OK) { d_fatal("CellWire initialization failed. Aborted");