summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-11-14 16:17:11 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-11-14 16:17:11 -0800
commit40f55b9e218389800c0dab50b50c9cd8ae0dcfe6 (patch)
tree6c5855d3793f34cc64258ea4dc9e3e992cc2f349
parentd814833b484634442161de7be4935d1bd3f991a7 (diff)
downloadvyatta-cfg-40f55b9e218389800c0dab50b50c9cd8ae0dcfe6.tar.gz
vyatta-cfg-40f55b9e218389800c0dab50b50c9cd8ae0dcfe6.zip
Use perl unlink rather than rm
Don't need to run a command to remove a file.
-rw-r--r--scripts/vyatta-interfaces.pl8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index 06bc3bb..c8e23a8 100644
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -264,7 +264,7 @@ sub stop_dhclient {
my ($intf_config_file, $intf_process_id_file, $intf_leases_file) = generate_dhclient_intf_files($intf);
my $release_cmd = "$dhcp_daemon -q -cf $intf_config_file -pf $intf_process_id_file -lf $intf_leases_file -r $intf 2> /dev/null";
system ($release_cmd);
- system ("rm -f $intf_config_file");
+ unlink ($intf_config_file);
}
sub update_eth_addrs {
@@ -318,7 +318,9 @@ sub delete_eth_addrs {
if ($addr eq "dhcp") {
stop_dhclient($intf);
- system("rm -f /var/lib/dhcp3/dhclient_$intf\_lease; rm -f /var/lib/dhcp3/$intf\; rm -f /var/run/vyatta/dhclient/dhclient_release_$intf\;");
+ unlink("/var/lib/dhcp3/dhclient_$intf\_lease");
+ unlink("/var/lib/dhcp3/$intf");
+ unlink("/var/run/vyatta/dhclient/dhclient_release_$intf");
exit 0;
}
my $version = is_ip_v4_or_v6($addr);
@@ -479,7 +481,7 @@ sub op_dhcp_command {
} elsif ($op_command eq "dhcp-renew") {
print "Renewing DHCP lease on $intf ...\n";
run_dhclient($intf);
- system ("rm -f $release_file\;");
+ unlink ($release_file);
exit 0;
}