diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2010-08-30 02:29:25 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2010-08-30 02:29:25 -0700 |
| commit | 642a9f6bef98c069e844bf3f47b69c7fdcfdb1ae (patch) | |
| tree | 5da4c06c11a631a049b3f453271472bf43ce8c58 | |
| parent | ef6dbf78677652a1534953f5b2ae6debbd20eb13 (diff) | |
| download | vyatta-cfg-quagga-642a9f6bef98c069e844bf3f47b69c7fdcfdb1ae.tar.gz vyatta-cfg-quagga-642a9f6bef98c069e844bf3f47b69c7fdcfdb1ae.zip | |
Bugfix 6085: Use "-x" flag instead of "-r" to kill the old dhclient process
The "-r" flag to "dhclient" kills the old dhclient daemon, but also
tries to release the lease on the server. Unfortunately, the program
will block forever if a lease had not actually been obtained. The
"-x" flag does all the same things as "-r", but doesn't try to release
the lease on the server, and hence doesn't block in the case where the
lease had not been obtained.
| -rw-r--r-- | scripts/vyatta-dhcpv6-client.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vyatta-dhcpv6-client.pl b/scripts/vyatta-dhcpv6-client.pl index b23d1700..3f01a677 100644 --- a/scripts/vyatta-dhcpv6-client.pl +++ b/scripts/vyatta-dhcpv6-client.pl @@ -118,7 +118,7 @@ if (defined $stop_flag || defined $release_flag) { # Stop dhclient -6 on $ifname printf("Stopping daemon...\n"); - my $output=`$cmdname -6 -nw -cf $conffile -pf $pidfile -lf $leasefile -r $ifname`; + my $output=`$cmdname -6 -nw -cf $conffile -pf $pidfile -lf $leasefile -x $ifname`; printf($output); # Delete files it leaves behind... |