Mercurial > hg > dhcpcd

changeset 3608:08c159103556 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Preserve lo0 routes if the global default is to persist.
author Roy Marples <roy@marples.name>
date Mon, 09 May 2016 08:22:38 +0000
parents f94550e09558
children 5f3c6e069d85
files dhcp6.c dhcpcd.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp6.c	Sun May 08 15:44:12 2016 +0000
+++ b/dhcp6.c	Mon May 09 08:22:38 2016 +0000
@@ -3341,7 +3341,7 @@
 	if (ifp->options)
 		options = ifp->options->options;
 	else
-		options = 0;
+		options = ifp->ctx->options;
 	dropdele = (options & (DHCPCD_STOPPING | DHCPCD_RELEASE) &&
 	    (options & DHCPCD_NODROP) != DHCPCD_NODROP);
 
--- a/dhcpcd.c	Sun May 08 15:44:12 2016 +0000
+++ b/dhcpcd.c	Mon May 09 08:22:38 2016 +0000
@@ -1172,6 +1172,7 @@
 {
 	struct interface *ifp;
 
+	ctx->options |= DHCPCD_EXITING;
 	/* Drop the last interface first */
 	TAILQ_FOREACH_REVERSE(ifp, ctx->ifaces, if_head, next) {
 		if (ifp->options) {