fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 19:50:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifupdown: fix up a bad rebase

Browse source 
Fixes: 0cb45af977
(cherry picked from commit e4aaa48b82)
This commit is contained in:
Lubomir Rintel 2016-03-14 16:39:43 +01:00
parent b2acf82276
commit 058dfebf7b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/plugins/ifupdown/nm-ifupdown-connection.c
View 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: (%d) %s",
__FILE__,
__LINE__,