about summary refs log tree commit diff
path: root/src/settings/plugins/ifcfg-rh/utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-08-07 14:23:24 +0200
committerMichael Biebl <biebl@debian.org>2012-08-07 14:23:24 +0200
commit7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (patch)
tree25da3ad8d884f15bde3c263281680a5fc3ea80e0 /src/settings/plugins/ifcfg-rh/utils.c
parent867254ea7c2b193fecf8cd36cc6e5dc53c290d92 (diff)
Imported Upstream version 0.9.5.96 upstream/0.9.5.96
Diffstat (limited to 'src/settings/plugins/ifcfg-rh/utils.c')
-rw-r--r--src/settings/plugins/ifcfg-rh/utils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index 908d3364..4e0afb96 100644
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -444,14 +444,16 @@ gone:
 }
 
 gboolean
-utils_disabling_ip4_config_allowed (NMConnection *connection)
+utils_ignore_ip_config (NMConnection *connection)
 {
 	NMSettingConnection *s_con;
 
 	s_con = nm_connection_get_setting_connection (connection);
 	g_assert (s_con);
 
-	/* bonding slaves are allowed to have no ip configuration */
+	/* bonding slaves have no IP configuration, and the system
+	 * scripts just ignore it if it's there.
+	 */
 	if (nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME))
 		return TRUE;