summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-03-15 20:07:45 +0100
committerLubomir Rintel <lkundrak@v3.sk>2016-03-16 11:38:00 +0100
commit8f82fa83cecdc9160444d9a55aaa332fb9a1cbc1 (patch)
tree1773a7ec4911e7890da6d009c4d8fa1858619bf0
parentecd42cd915abb78167aa7cb27c90458db6526740 (diff)
downloadNetworkManager-8f82fa83cecdc9160444d9a55aaa332fb9a1cbc1.tar.gz
ethernet: set the connection type when generating the connection
Otherwise the connection wouldn't verify: <error> [1458066126.2270] device (eth10): Generated connection does not verify: connection.type: property type should be set to '802-3-ethernet' <debug> [1458066126.2271] manager: (eth10): can't assume; no connection (cherry picked from commit 4b71939e9ac3df93bfe72af0eac42b4ebaf94e15)
-rw-r--r--src/devices/nm-device-ethernet.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 11356d46e9..6225ae7bf6 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -1499,6 +1499,11 @@ update_connection (NMDevice *device, NMConnection *connection)
nm_connection_add_setting (connection, (NMSetting *) s_wired);
}
+ g_object_set (nm_connection_get_setting_connection (connection),
+ NM_SETTING_CONNECTION_TYPE, nm_connection_get_setting_pppoe (connection)
+ ? NM_SETTING_PPPOE_SETTING_NAME
+ : NM_SETTING_WIRED_SETTING_NAME, NULL);
+
/* If the device reports a permanent address, use that for the MAC address
* and the current MAC, if different, is the cloned MAC.
*/