diff options
| author | Roy Marples <roy@marples.name> | 2013-11-20 11:37:25 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2013-11-20 11:37:25 +0000 |
| commit | 4873594f06ca952eeedb1e52acdf3b5afbffb9e2 (patch) | |
| tree | bdfbb9b767d28954fb074ada1a7c406a65a8c118 /dhcpcd.c | |
| parent | c5ae651a6d5948e0a5e3164471c961b3c4de3161 (diff) | |
| download | dhcpcd-4873594f06ca952eeedb1e52acdf3b5afbffb9e2.tar.xz | |
When releasing, we need to de-configure the interface as well.
Diffstat (limited to 'dhcpcd.c')
| -rw-r--r-- | dhcpcd.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -325,6 +325,11 @@ configure_interface1(struct interface *ifp) /* Do any platform specific configuration */ if_conf(ifp); + /* If we want to release a lease, we can't really persist the + * address either. */ + if (ifo->options & DHCPCD_RELEASE) + ifo->options &= ~DHCPCD_PERSISTENT; + if (ifp->flags & IFF_POINTOPOINT && !(ifo->options & DHCPCD_INFORM)) ifo->options |= DHCPCD_STATIC; if (ifp->flags & IFF_NOARP || @@ -889,8 +894,10 @@ handle_signal(int sig, siginfo_t *siginfo, __unused void *context) ifp = TAILQ_LAST(ifaces, if_head); if (ifp == NULL) break; - if (do_release) + if (do_release) { ifp->options->options |= DHCPCD_RELEASE; + ifp->options->options &= ~DHCPCD_PERSISTENT; + } ifp->options->options |= DHCPCD_EXITING; stop_interface(ifp); } @@ -1027,8 +1034,10 @@ handle_args(struct fd_list *fd, int argc, char **argv) for (oi = optind; oi < argc; oi++) { if ((ifp = find_interface(argv[oi])) == NULL) continue; - if (do_release) + if (do_release) { ifp->options->options |= DHCPCD_RELEASE; + ifp->options->options &= ~DHCPCD_PERSISTENT; + } ifp->options->options |= DHCPCD_EXITING; stop_interface(ifp); } |