diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
| commit | 02d69323d320e0df4d7daa6115ee1ac1239b1a58 (patch) | |
| tree | b83a6b9a01b302117d31476361971212f9fd1750 /src/settings/plugins/ifcfg-rh/utils.c | |
| parent | d31839fb4152978db9734e24c00fbac4f42debb7 (diff) | |
| parent | 9c202e3e860b3be9e1f8882630b69affbb130102 (diff) | |
Merge tag 'upstream/0.9.7.995' into experimental
Upstream version 0.9.7.995
Diffstat (limited to 'src/settings/plugins/ifcfg-rh/utils.c')
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c index 4e0afb96..04df6671 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/utils.c @@ -454,7 +454,8 @@ utils_ignore_ip_config (NMConnection *connection) /* 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)) + if ( nm_setting_connection_is_slave_type (s_con, NM_SETTING_BOND_SETTING_NAME) + || nm_setting_connection_is_slave_type (s_con, NM_SETTING_BRIDGE_SETTING_NAME)) return TRUE; return FALSE; |