colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: takeover existing virtual devices in system_create_virtual_device

Browse Source 
If a virtual device is about to be added and it already exists, it gets
reused.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2013-08-06 19:34:43 +02:00
committed by Dan Williams
parent 1f084567f0
commit ac24000650
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nm-manager.c
View File

@@ -1319,7 +1319,9 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
g_signal_handlers_block_by_func (nm_platform_get (), G_CALLBACK (platform_link_added_cb), self); g_signal_handlers_block_by_func (nm_platform_get (), G_CALLBACK (platform_link_added_cb), self);
if (nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME)) { if (nm_connection_is_type (connection, NM_SETTING_BOND_SETTING_NAME)) {
if (!nm_platform_bond_add (iface)) {
if ( !nm_platform_bond_add (iface)
&& nm_platform_get_error () != NM_PLATFORM_ERROR_EXISTS) {
nm_log_warn (LOGD_DEVICE, "(%s): failed to add bonding master interface for '%s'", nm_log_warn (LOGD_DEVICE, "(%s): failed to add bonding master interface for '%s'",
iface, nm_connection_get_id (connection)); iface, nm_connection_get_id (connection));
goto unblock; goto unblock;
@@ -1350,9 +1352,10 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
int num, i; int num, i;
guint32 from, to; guint32 from, to;
if (!nm_platform_vlan_add (iface, ifindex, if ( !nm_platform_vlan_add (iface, ifindex,
nm_setting_vlan_get_id (s_vlan), nm_setting_vlan_get_id (s_vlan),
nm_setting_vlan_get_flags (s_vlan))) { nm_setting_vlan_get_flags (s_vlan))
&& nm_platform_get_error () != NM_PLATFORM_ERROR_EXISTS) {
nm_log_warn (LOGD_DEVICE, "(%s): failed to add VLAN interface for '%s'", nm_log_warn (LOGD_DEVICE, "(%s): failed to add VLAN interface for '%s'",
iface, nm_connection_get_id (connection)); iface, nm_connection_get_id (connection));
goto unblock; goto unblock;
@@ -1375,7 +1378,8 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
parent_ifindex = nm_device_get_ifindex (parent); parent_ifindex = nm_device_get_ifindex (parent);
p_key = nm_setting_infiniband_get_p_key (s_infiniband); p_key = nm_setting_infiniband_get_p_key (s_infiniband);
if (!nm_platform_infiniband_partition_add (parent_ifindex, p_key)) { if ( !nm_platform_infiniband_partition_add (parent_ifindex, p_key)
&& nm_platform_get_error () != NM_PLATFORM_ERROR_EXISTS) {
nm_log_warn (LOGD_DEVICE, "(%s): failed to add InfiniBand P_Key interface for '%s'", nm_log_warn (LOGD_DEVICE, "(%s): failed to add InfiniBand P_Key interface for '%s'",
iface, nm_connection_get_id (connection)); iface, nm_connection_get_id (connection));
goto unblock; goto unblock;