colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main: (order) check pidfile earlier for running NM

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@@ -285,6 +285,8 @@ main (int argc, char *argv[])
nm_main_utils_ensure_root (); nm_main_utils_ensure_root ();
nm_main_utils_ensure_not_running_pidfile (global_opt.pidfile);
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,
@@ -332,8 +334,6 @@ main (int argc, char *argv[])
nm_main_utils_ensure_rundir (); nm_main_utils_ensure_rundir ();
nm_main_utils_ensure_not_running_pidfile (global_opt.pidfile);
/* 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);

16
src/nm-iface-helper.c
View File

@@ -378,6 +378,14 @@ main (int argc, char *argv[])
exit (1); exit (1);
} }
ifindex = if_nametoindex (global_opt.ifname);
if (ifindex <= 0) {
fprintf (stderr, _("Failed to find interface index for %s (%s)\n"), global_opt.ifname, strerror (errno));
exit (1);
}
pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, ifindex);
nm_main_utils_ensure_not_running_pidfile (pidfile);
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,
@@ -395,14 +403,6 @@ main (int argc, char *argv[])
nm_main_utils_ensure_rundir (); nm_main_utils_ensure_rundir ();
ifindex = if_nametoindex (global_opt.ifname);
if (ifindex <= 0) {
fprintf (stderr, _("Failed to find interface index for %s (%s)\n"), global_opt.ifname, strerror (errno));
exit (1);
}
pidfile = g_strdup_printf (NMIH_PID_FILE_FMT, ifindex);
nm_main_utils_ensure_not_running_pidfile (pidfile);
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;