diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-11-07 12:19:50 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-11-07 12:20:43 -0600 |
| commit | 289f788158d2106b69073aecaa76f9afd4da2c58 (patch) | |
| tree | e73aa5dc03a2d1897841029ec2451fbfffd6b899 /src/nm-ip4-config.c | |
| parent | cbabd135818fd4749ad0b827ba1f0bc444b92a97 (diff) | |
| parent | 5149fd120d24e7622fb264fffaa4bed04eb579d6 (diff) | |
| download | NetworkManager-289f788158d2106b69073aecaa76f9afd4da2c58.tar.gz | |
merge: add 'configure-and-quit' option (rh #1083683) (rh #863515)
When initial configuration is complete, spawns helpers to preserve
DHCP and RA addresses on interfaces and quits the main NM process.
Diffstat (limited to 'src/nm-ip4-config.c')
| -rw-r--r-- | src/nm-ip4-config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 72c1b0cd75..7548daded0 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -83,6 +83,7 @@ nm_ip4_config_new (void) } +#ifndef NM_IFACE_HELPER void nm_ip4_config_export (NMIP4Config *config) { @@ -94,6 +95,7 @@ nm_ip4_config_export (NMIP4Config *config) nm_dbus_manager_register_object (nm_dbus_manager_get (), priv->path, config); } } +#endif const char * nm_ip4_config_get_dbus_path (const NMIP4Config *config) @@ -1952,7 +1954,9 @@ nm_ip4_config_class_init (NMIP4ConfigClass *config_class) g_object_class_install_properties (object_class, LAST_PROP, obj_properties); +#ifndef NM_IFACE_HELPER nm_dbus_manager_register_exported_type (nm_dbus_manager_get (), G_TYPE_FROM_CLASS (config_class), &dbus_glib_nm_ip4_config_object_info); +#endif } |