[PATCH 5/7] bonding: Abort activation of unknown slave types



Abort activation of slaves which are unknown and log successful
enslave/release.

Signed-off-by: Thomas Graf <tgraf redhat com>
---
 src/nm-device.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/nm-device.c b/src/nm-device.c
index bb1c9e5..966f553 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -899,8 +899,18 @@ handle_slave_activation (NMDevice *slave, NMDevice *master)
 			return FALSE;
 
 		nm_device_hw_bring_up (slave, TRUE, NULL);
+	} else {
+		nm_log_warn (LOGD_DEVICE, "(%s): Unable to enslave. Unknown slave type '%s'",
+		             nm_device_get_iface (slave), nm_setting_connection_get_slave_type (s_con));
+
+		/* Abort activation */
+		return FALSE;
 	}
 
+	nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 1 of 5 (Device Prepare) enslaved to %s",
+	             nm_device_get_iface (slave),
+				 nm_device_get_iface (master));
+
 	return TRUE;
 }
 
@@ -918,6 +928,11 @@ handle_slave_deactivation (NMDevice *slave, NMDevice *master)
 
 	if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME))
 		nm_system_iface_release (slave, master);
+	else
+		return;
+
+	nm_log_info (LOGD_DEVICE, "Device %s released from master %s",
+	             nm_device_get_iface (slave), nm_device_get_iface (master));
 }
 
 /*
-- 
1.7.7.3



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]