summaryrefslogtreecommitdiffstats
path: root/dhcpcd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2013-03-26 10:42:30 +0000
committerRoy Marples <roy@marples.name>2013-03-26 10:42:30 +0000
commit891ca6fad34271f26d26bfd08b95d186f3471cd6 (patch)
treee09145822345d7b6a7f0e7271cceb20d1886e51f /dhcpcd.c
parentcbfb0ee96c70d4e507d127cb56927d007fd699ef (diff)
downloaddhcpcd-891ca6fad34271f26d26bfd08b95d186f3471cd6.tar.xz
Fix rebooting.
Diffstat (limited to 'dhcpcd.c')
-rw-r--r--dhcpcd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index f7f782d3..2e121d5c 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -604,7 +604,7 @@ if_reboot(struct interface *ifp, int argc, char **argv)
oldopts = ifp->options->options;
configure_interface(ifp, argc, argv);
- dhcp_reboot(ifp, oldopts);
+ dhcp_reboot_newopts(ifp, oldopts);
start_interface(ifp);
}
@@ -692,9 +692,6 @@ handle_signal(int sig)
break;
case SIGALRM:
syslog(LOG_INFO, "received SIGALRM, rebinding");
- /* We shouldn't modify any variables in the signal
- * handler, so simply add reboot function to the queue
- * for an immediate callout. */
eloop_timeout_add_now(sig_reboot, NULL);
return;
case SIGHUP: