mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-07 11:58:12 +02:00
wwan: enable manual IP configuration
Before 1.36, manual addresses from the profile were assigned to the interface; restore that behavior. The manual IP configuration also contains the DNS priority from the profile; so this change ensures that the merged l3cd has a DNS priority and that dynamically discovered DNS servers are not ignored by the DNS manager. Fixes:58287cbcc0('core: rework IP configuration in NetworkManager using layer 3 configuration') (cherry picked from commit0717589972)
This commit is contained in:
parent
2128e4542e
commit
2ddb643319
1 changed files with 3 additions and 3 deletions
|
|
@ -623,11 +623,11 @@ is_available(NMDevice *device, NMDeviceCheckDevAvailableFlags flags)
|
||||||
static gboolean
|
static gboolean
|
||||||
ready_for_ip_config(NMDevice *device, gboolean is_manual)
|
ready_for_ip_config(NMDevice *device, gboolean is_manual)
|
||||||
{
|
{
|
||||||
/* Tell NMDevice to only run device-specific IP
|
/* Tell NMDevice to only run manual and device-specific IP
|
||||||
* configuration (devip) and skip other methods
|
* configuration (devip) and skip other methods
|
||||||
* (manual, dhcp, etc).
|
* (dhcp, link-local, shared, etc).
|
||||||
*/
|
*/
|
||||||
return FALSE;
|
return is_manual;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue