From 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 7 Aug 2012 14:23:24 +0200 Subject: Imported Upstream version 0.9.5.96 --- src/settings/plugins/ifcfg-rh/utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/settings/plugins/ifcfg-rh/utils.c') 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; -- cgit 1.3.0-6-gf8a5