main: (order) check pidfile earlier for running NM

We should check for conflicting process (pidfile)
early on and error out.
This commit is contained in:
Thomas Haller
2015-03-14 17:58:23 +01:00
parent e36bfaadf7
commit af2b44cb43
2 changed files with 10 additions and 10 deletions

View File

@@ -285,6 +285,8 @@ main (int argc, char *argv[])
nm_main_utils_ensure_root ();
nm_main_utils_ensure_not_running_pidfile (global_opt.pidfile);
if (!nm_logging_setup (global_opt.opt_log_level,
global_opt.opt_log_domains,
&bad_domains,
@@ -332,8 +334,6 @@ main (int argc, char *argv[])
nm_main_utils_ensure_rundir ();
nm_main_utils_ensure_not_running_pidfile (global_opt.pidfile);
/* Read the config file and CLI overrides */
config = nm_config_setup (config_cli, &error);
nm_config_cmd_line_options_free (config_cli);