diff options
| author | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-12-12 15:53:47 +0100 |
| commit | 743faa81fda27a9c03298e8d6074623dc30db606 (patch) | |
| tree | 28418e92b22530bb05f043084626291ed1e3d46b /src/settings/plugins/ibft | |
| parent | 8dda18a856c2a05cefcab6278469c9d8df30f935 (diff) | |
| parent | afcd268ea7b1149fbfb66bce4eca659b675da0a2 (diff) | |
Update upstream source from tag 'upstream/1.10.2'
Update to upstream version '1.10.2' with Debian dir 41691ea145b392588cd4e9e7496b61d5a95965fb
Diffstat (limited to 'src/settings/plugins/ibft')
| -rw-r--r-- | src/settings/plugins/ibft/nms-ibft-connection.c | 11 | ||||
| -rw-r--r-- | src/settings/plugins/ibft/nms-ibft-plugin.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/settings/plugins/ibft/nms-ibft-connection.c b/src/settings/plugins/ibft/nms-ibft-connection.c index 834ba834..2a7c5f4a 100644 --- a/src/settings/plugins/ibft/nms-ibft-connection.c +++ b/src/settings/plugins/ibft/nms-ibft-connection.c @@ -60,11 +60,12 @@ nms_ibft_connection_new (const GPtrArray *block, GError **error) object = g_object_new (NMS_TYPE_IBFT_CONNECTION, NULL); /* Update settings with what was read from iscsiadm */ - if (!nm_settings_connection_replace_settings (NM_SETTINGS_CONNECTION (object), - source, - FALSE, - NULL, - error)) + if (!nm_settings_connection_update (NM_SETTINGS_CONNECTION (object), + source, + NM_SETTINGS_CONNECTION_PERSIST_MODE_KEEP, + NM_SETTINGS_CONNECTION_COMMIT_REASON_NONE, + NULL, + error)) g_clear_object (&object); return (NMSIbftConnection *) object; diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c index 9b1f5ccd..ea4d1524 100644 --- a/src/settings/plugins/ibft/nms-ibft-plugin.c +++ b/src/settings/plugins/ibft/nms-ibft-plugin.c @@ -202,5 +202,5 @@ settings_plugin_interface_init (NMSettingsPluginInterface *plugin_iface) G_MODULE_EXPORT GObject * nm_settings_plugin_factory (void) { - return g_object_ref (nms_ibft_plugin_get ()); + return G_OBJECT (g_object_ref (nms_ibft_plugin_get ())); } |