ifupdown: fix up a bad rebase
authorLubomir Rintel <lkundrak@v3.sk>
Mon, 14 Mar 2016 15:39:43 +0000 (16:39 +0100)
committerLubomir Rintel <lkundrak@v3.sk>
Mon, 14 Mar 2016 15:39:43 +0000 (16:39 +0100)
Fixes: 0cb45af97761e47d97c8f76346f7f1bef46ce2cb

src/settings/plugins/ifupdown/nm-ifupdown-connection.c

index 7e383e2..e6c75c6 100644 (file)
@@ -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__,