From 3f7e03e8134fc50fb1b918a27109ae20ea87e9c9 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sat, 30 Dec 2017 20:16:31 +0100 Subject: [PATCH] Refactor, re-order a bit so screen_init() doesn't run in rescue mode Signed-off-by: Joachim Nilsson --- src/finit.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/finit.c b/src/finit.c index 7c23c4b6..bbd31938 100644 --- a/src/finit.c +++ b/src/finit.c @@ -334,19 +334,6 @@ int main(int argc, char* argv[]) if (getpid() != 1) return client(argc, argv); - /* Set up canvas */ - screen_init(); - - /* - * In case of emergency. - */ - emergency_shell(); - - /* - * Initial setup of signals, ignore all until we're up. - */ - sig_init(); - /* * Initalize event context. */ @@ -374,6 +361,20 @@ int main(int argc, char* argv[]) */ conf_parse_cmdline(); + /* Set up canvas */ + if (!rescue) + screen_init(); + + /* + * In case of emergency. + */ + emergency_shell(); + + /* + * Initial setup of signals, ignore all until we're up. + */ + sig_init(); + /* * Load plugins early, finit.conf may contain references to * features implemented by plugins.