main: (order) earlier create rundir
Create the rundir earlier and before setting up nm-logging. nm_main_utils_ensure_rundir() errors out with fprintf(stderr) and does not need nm-logging.
This commit is contained in:
16
src/main.c
16
src/main.c
@@ -287,6 +287,14 @@ main (int argc, char *argv[])
|
|||||||
|
|
||||||
nm_main_utils_ensure_not_running_pidfile (global_opt.pidfile);
|
nm_main_utils_ensure_not_running_pidfile (global_opt.pidfile);
|
||||||
|
|
||||||
|
/* Ensure state directory exists */
|
||||||
|
if (g_mkdir_with_parents (NMSTATEDIR, 0755) != 0) {
|
||||||
|
fprintf (stderr, "Cannot create '%s': %s", NMSTATEDIR, strerror (errno));
|
||||||
|
exit (1);
|
||||||
|
}
|
||||||
|
|
||||||
|
nm_main_utils_ensure_rundir ();
|
||||||
|
|
||||||
if (!nm_logging_setup (global_opt.opt_log_level,
|
if (!nm_logging_setup (global_opt.opt_log_level,
|
||||||
global_opt.opt_log_domains,
|
global_opt.opt_log_domains,
|
||||||
&bad_domains,
|
&bad_domains,
|
||||||
@@ -326,14 +334,6 @@ main (int argc, char *argv[])
|
|||||||
g_free (path);
|
g_free (path);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Ensure state directory exists */
|
|
||||||
if (g_mkdir_with_parents (NMSTATEDIR, 0755) != 0) {
|
|
||||||
nm_log_err (LOGD_CORE, "Cannot create '%s': %s", NMSTATEDIR, strerror (errno));
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
nm_main_utils_ensure_rundir ();
|
|
||||||
|
|
||||||
/* Read the config file and CLI overrides */
|
/* Read the config file and CLI overrides */
|
||||||
config = nm_config_setup (config_cli, &error);
|
config = nm_config_setup (config_cli, &error);
|
||||||
nm_config_cmd_line_options_free (config_cli);
|
nm_config_cmd_line_options_free (config_cli);
|
||||||
|
@@ -386,6 +386,8 @@ main (int argc, char *argv[])
|
|||||||
pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, ifindex);
|
pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, ifindex);
|
||||||
nm_main_utils_ensure_not_running_pidfile (pidfile);
|
nm_main_utils_ensure_not_running_pidfile (pidfile);
|
||||||
|
|
||||||
|
nm_main_utils_ensure_rundir ();
|
||||||
|
|
||||||
if (!nm_logging_setup (global_opt.opt_log_level,
|
if (!nm_logging_setup (global_opt.opt_log_level,
|
||||||
global_opt.opt_log_domains,
|
global_opt.opt_log_domains,
|
||||||
&bad_domains,
|
&bad_domains,
|
||||||
@@ -401,8 +403,6 @@ main (int argc, char *argv[])
|
|||||||
g_clear_pointer (&bad_domains, g_free);
|
g_clear_pointer (&bad_domains, g_free);
|
||||||
}
|
}
|
||||||
|
|
||||||
nm_main_utils_ensure_rundir ();
|
|
||||||
|
|
||||||
if (global_opt.become_daemon && !global_opt.debug) {
|
if (global_opt.become_daemon && !global_opt.debug) {
|
||||||
if (daemon (0, 0) < 0) {
|
if (daemon (0, 0) < 0) {
|
||||||
int saved_errno;
|
int saved_errno;
|
||||||
|
Reference in New Issue
Block a user