summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohit Mehta <mohit.mehta@vyatta.com>2009-06-26 18:27:18 -0700
committerMohit Mehta <mohit.mehta@vyatta.com>2009-06-26 18:52:29 -0700
commitb0127a4c593933f6d4ae69e7d4f53132e8f9f0e9 (patch)
tree4c75381674c36ad96fb0f7b0212fe50c1c5c9192
parent895501d1bd3eceef185074205c10a8c740e5bf64 (diff)
downloadvyatta-cfg-quagga-b0127a4c593933f6d4ae69e7d4f53132e8f9f0e9.tar.gz
vyatta-cfg-quagga-b0127a4c593933f6d4ae69e7d4f53132e8f9f0e9.zip
make changes to work with dhcp 4.1.0
-rwxr-xr-xscripts/netplug/linkdown/dhclient3
-rwxr-xr-xscripts/netplug/linkup/dhclient3
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/netplug/linkdown/dhclient b/scripts/netplug/linkdown/dhclient
index a69caed3..555ff913 100755
--- a/scripts/netplug/linkdown/dhclient
+++ b/scripts/netplug/linkdown/dhclient
@@ -41,7 +41,8 @@ sub stop_dhclient {
my $intf = shift;
my $dhcp_daemon = '/sbin/dhclient';
my ($intf_config_file, $intf_process_id_file, $intf_leases_file) = Vyatta::Misc::generate_dhclient_intf_files($intf);
- my $release_cmd = "sudo $dhcp_daemon -q -cf $intf_config_file -pf $intf_process_id_file -lf $intf_leases_file -r $intf 2> /dev/null";
+ my $release_cmd = "sudo $dhcp_daemon -q -cf $intf_config_file -pf $intf_process_id_file -lf $intf_leases_file -r $intf 2> /dev/null;";
+ $release_cmd .= "sudo rm -f $intf_process_id_file 2> /dev/null";
system ($release_cmd);
}
diff --git a/scripts/netplug/linkup/dhclient b/scripts/netplug/linkup/dhclient
index c7370841..8e50715f 100755
--- a/scripts/netplug/linkup/dhclient
+++ b/scripts/netplug/linkup/dhclient
@@ -41,7 +41,8 @@ sub run_dhclient {
my $intf = shift;
my $dhcp_daemon = '/sbin/dhclient';
my ($intf_config_file, $intf_process_id_file, $intf_leases_file) = Vyatta::Misc::generate_dhclient_intf_files($intf);
- my $cmd = "sudo $dhcp_daemon -q -nw -cf $intf_config_file -pf $intf_process_id_file -lf $intf_leases_file $intf 2> /dev/null &";
+ my $cmd = "sudo $dhcp_daemon -pf $intf_process_id_file -x $intf 2> /dev/null; sudo rm -f $intf_process_id_file 2> /dev/null;";
+ $cmd .= "sudo $dhcp_daemon -q -nw -cf $intf_config_file -pf $intf_process_id_file -lf $intf_leases_file $intf 2> /dev/null &";
system ($cmd);
}