device: only 'ignore-auto-routes' and 'ignore-auto-dns' for certain settingsth/device-ignore-auto-bgo752546

During merge_and_apply(), we merge several NMIPxConfig into a new
@composite. For 'ignore-auto-routes' and 'ignore-auto-dns', we want to
prevent certain routes/dns-settings to be merged.

But it is wrong to reject settings from all partial configs.
For example, especially ext_ipx_config and vpn_ipx_config contain
routes that we still must merge and preserve.

This was recently changed by 79630c11e502c3b0b958abc0b1b5d777a3db2a98
and previously by ab6548c62134518ba2871306397e7fb9c84260ca. But it was
wrong for a long time already.

Also note, that nm_ip4_config_merge() now also ignores NIS, WINS, and
dns-options.

https://bugzilla.gnome.org/show_bug.cgi?id=752546

Fixes: 79630c11e502c3b0b958abc0b1b5d777a3db2a98

0 files changed, 0 insertions, 0 deletions