diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-14 16:39:43 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-03-14 16:39:43 +0100 |
| commit | e4aaa48b8297359987a02e5bab9e119939237638 (patch) | |
| tree | e1e0be4366c22bf420e4afeecc7bf9317f09f335 | |
| parent | ad8251e3a49b9664a059325556396cbac42c759e (diff) | |
| download | NetworkManager-e4aaa48b8297359987a02e5bab9e119939237638.tar.gz | |
ifupdown: fix up a bad rebase
Fixes: 0cb45af97761e47d97c8f76346f7f1bef46ce2cb
| -rw-r--r-- | src/settings/plugins/ifupdown/nm-ifupdown-connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index 7e383e2a5d..e6c75c6fd9 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -46,7 +46,7 @@ nm_ifupdown_connection_new (if_block *block) object = g_object_new (NM_TYPE_IFUPDOWN_CONNECTION, NULL); - if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), priv->ifblock, &error)) { + if (!ifupdown_update_connection_from_if_block (NM_CONNECTION (object), block, &error)) { nm_log_warn (LOGD_SETTINGS, "%s.%d - invalid connection read from /etc/network/interfaces: %s", __FILE__, __LINE__, |