diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-11-06 13:10:15 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-11-07 11:23:32 -0600 |
| commit | 5d122c5d2dbe1b32758b1e5b5d2e8161e7e34342 (patch) | |
| tree | 9e02920f8bd6f17b1f7550687d7a4cebd553e03b | |
| parent | 70c9eda370a2ce37c5e8aeabc166fecbf5789481 (diff) | |
| download | NetworkManager-5d122c5d2dbe1b32758b1e5b5d2e8161e7e34342.tar.gz | |
fixup! core: add option to quit when startup is complete (rh #863515) (rh #1083683)
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/nm-config.c | 8 | ||||
| -rw-r--r-- | src/nm-config.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main.c b/src/main.c index 60527e24b8..708545fd4c 100644 --- a/src/main.c +++ b/src/main.c @@ -185,7 +185,7 @@ manager_startup_complete (NMManager *manager, GParamSpec *pspec, gpointer user_d g_object_get (G_OBJECT (manager), NM_MANAGER_STARTUP, &startup, NULL); - if (!startup && nm_config_get_configure_quit (config)) { + if (!startup && nm_config_get_configure_and_quit (config)) { nm_log_info (LOGD_CORE, "quitting now that startup is complete"); g_main_loop_quit (main_loop); } diff --git a/src/nm-config.c b/src/nm-config.c index b113038d14..26d5cb437a 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -62,7 +62,7 @@ typedef struct { char **no_auto_default; char **ignore_carrier; - gboolean config_quit; + gboolean configure_and_quit; } NMConfigPrivate; static NMConfig *singleton = NULL; @@ -221,9 +221,9 @@ nm_config_get_connectivity_response (NMConfig *config) } gboolean -nm_config_get_configure_quit (NMConfig *config) +nm_config_get_configure_and_quit (NMConfig *config) { - return NM_CONFIG_GET_PRIVATE (config)->config_quit; + return NM_CONFIG_GET_PRIVATE (config)->configure_and_quit; } char * @@ -631,7 +631,7 @@ nm_config_new (GError **error) priv->ignore_carrier = g_key_file_get_string_list (priv->keyfile, "main", "ignore-carrier", NULL, NULL); - priv->config_quit = g_key_file_get_boolean (priv->keyfile, "main", "configure-quit", NULL); + priv->configure_and_quit = g_key_file_get_boolean (priv->keyfile, "main", "configure-and-quit", NULL); return singleton; } diff --git a/src/nm-config.h b/src/nm-config.h index 32e997d004..56f75fb5f6 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -61,7 +61,7 @@ const char *nm_config_get_debug (NMConfig *config); const char *nm_config_get_connectivity_uri (NMConfig *config); guint nm_config_get_connectivity_interval (NMConfig *config); const char *nm_config_get_connectivity_response (NMConfig *config); -gboolean nm_config_get_configure_quit (NMConfig *config); +gboolean nm_config_get_configure_and_quit (NMConfig *config); gboolean nm_config_get_ethernet_can_auto_default (NMConfig *config, NMDevice *device); void nm_config_set_ethernet_no_auto_default (NMConfig *config, NMDevice *device); |