diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /src/settings/plugins/ifcfg-rh/utils.c | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'src/settings/plugins/ifcfg-rh/utils.c')
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/utils.c | 6 |
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; |