Commit 624347ba authored by Thomas Haller's avatar Thomas Haller

device: on reapply reset commit_first_time flag

Based on this flag, we decide that:
  - if we are not gonna commit the first time and the
    connection is configured with never-default, we
    would not remove a default route added externally.

During a reapply, we however want to get rid of an externally
configured default route.
parent c2dc1c6f
......@@ -302,6 +302,9 @@ typedef struct _NMDevicePrivate {
bool up:1; /* IFF_UP */
bool v4_commit_first_time:1;
bool v6_commit_first_time:1;
/* Generic DHCP stuff */
guint32 dhcp_timeout;
char * dhcp_anycast_address;
......@@ -332,9 +335,6 @@ typedef struct _NMDevicePrivate {
NMPlatformIP6Route v6;
} default_route;
bool v4_commit_first_time;
bool v6_commit_first_time;
/* DHCPv4 tracking */
struct {
NMDhcpClient * client;
......@@ -8676,6 +8676,9 @@ check_and_reapply_connection (NMDevice *self,
} else
con_old = con_new = applied;
priv->v4_commit_first_time = TRUE;
priv->v6_commit_first_time = TRUE;
/**************************************************************************
* Reapply changes
*************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment