Use directory /var/lib/dhcp instead of /var/lib/dhcp3.

Use directory /etc/dhcp instead of /etc/dhcp3.

5 files changed, 11 insertions, 11 deletions

diff --git a/scripts/vyatta-address b/scripts/vyatta-address
index afe60191..072f27e6 100755
--- a/scripts/vyatta-address
+++ b/scripts/vyatta-address
@@ -28,10 +28,10 @@ case $1 in
     delete)
         # Get current address from interface when using DHCP
         if [[ "$3" = "dhcp" ]]; then
-            lease_file=/var/lib/dhcp3/dhclient_"$2".leases;
+            lease_file=/var/lib/dhcp/dhclient_"$2".leases;
             ip_address=$(sed -n 's/^\s\sfixed-address\s\(.*\);/\1/p' $lease_file | sed -n '$p');
         elif [[ "$3" = "dhcpv6" ]]; then
-            lease_file=/var/lib/dhcp3/dhclient_v6_"$2".leases;
+            lease_file=/var/lib/dhcp/dhclient_v6_"$2".leases;
             ip_address=$(sed -n 's/^\s\s\s\siaaddr\s\(.*\)\s{/\1/p' $lease_file | sed -n '$p');        
         else
             ip_address=$3;
diff --git a/scripts/vyatta-dhcp-helper.pl b/scripts/vyatta-dhcp-helper.pl
index 40291654..6febbaf9 100644
--- a/scripts/vyatta-dhcp-helper.pl
+++ b/scripts/vyatta-dhcp-helper.pl
@@ -18,7 +18,7 @@ sub get_dhcp_router {
     if (!Vyatta::Misc::is_dhcp_enabled($dhcp_iface,0)) {
         return "127.0.0.1";
     }
-    my $lease = "/var/lib/dhcp3/dhclient_${dhcp_iface}_lease";
+    my $lease = "/var/lib/dhcp/dhclient_${dhcp_iface}_lease";
     my $router = `grep new_routers= $lease | cut -d"'" -f2`;
     my @r = split(/,/, $router);
     $router = $r[0];
diff --git a/scripts/vyatta-dhcpv6-client.pl b/scripts/vyatta-dhcpv6-client.pl
index 384d4d62..74cc4db2 100755
--- a/scripts/vyatta-dhcpv6-client.pl
+++ b/scripts/vyatta-dhcpv6-client.pl
@@ -98,9 +98,9 @@ GetOptions("start" => \$start_flag,
 die "Error: Interface name must be specified with --ifname parameter.\n"
     unless $ifname;
 
-my $pidfile = "/var/lib/dhcp3/dhclient_v6_$ifname.pid";
-my $leasefile = "/var/lib/dhcp3/dhclient_v6_$ifname.leases";
-my $conffile = "/var/lib/dhcp3/dhclient_v6_$ifname.conf";
+my $pidfile = "/var/lib/dhcp/dhclient_v6_$ifname.pid";
+my $leasefile = "/var/lib/dhcp/dhclient_v6_$ifname.leases";
+my $conffile = "/var/lib/dhcp/dhclient_v6_$ifname.conf";
 my $cmdname = "/sbin/dhclient";
 
 if ($release_flag) {
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index d04ad395..a91a66e8 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -363,15 +363,15 @@ sub dhcp {
         unlink($release_file);
     } elsif ($request eq "start") {
         print "Starting DHCP client on $intf ...\n";
-        touch("/var/lib/dhcp3/$intf");
+        touch("/var/lib/dhcp/$intf");
         run_dhclient($intf);
     } elsif ($request eq "stop") {
         print "Stopping DHCP client on $intf ...\n";
         stop_dhclient($intf);
-        unlink("/var/lib/dhcp3/dhclient_$intf\_lease");
-        unlink("/var/lib/dhcp3/$intf");
+        unlink("/var/lib/dhcp/dhclient_$intf\_lease");
+        unlink("/var/lib/dhcp/$intf");
         unlink("/var/run/vyatta/dhclient/dhclient_release_$intf");
-        unlink("/var/lib/dhcp3/dhclient_$intf\.conf");
+        unlink("/var/lib/dhcp/dhclient_$intf\.conf");
     } else {
         die "Unknown DHCP request: $request\n";
     }
diff --git a/scripts/vyatta-update-tunnel.pl b/scripts/vyatta-update-tunnel.pl
index d4c652d0..de5019ab 100644
--- a/scripts/vyatta-update-tunnel.pl
+++ b/scripts/vyatta-update-tunnel.pl
@@ -10,7 +10,7 @@ GetOptions("interface=s"    => \$iface,
            "tunnel=s"       => \$tunnel,
            "option=s"       => \$option
            );
-my $FILE_DHCP_HOOK = "/etc/dhcp3/dhclient-exit-hooks.d/tunnel-$tunnel";
+my $FILE_DHCP_HOOK = "/etc/dhcp/dhclient-exit-hooks.d/tunnel-$tunnel";
 my $dhcp_hook = '';
 if ($option eq 'create') {
     $dhcp_hook =<<EOS;