diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 04:17:49 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 04:17:49 -0500 |
| commit | 918b53841364a016eec0e2996640c471f738e93b (patch) | |
| tree | db9c7b906958bebff3a480c46dc54775c3c3782d | |
| parent | 59240c87059fd207b3ec38238851f6fe6982e48c (diff) | |
| download | vyatta-op-918b53841364a016eec0e2996640c471f738e93b.tar.gz vyatta-op-918b53841364a016eec0e2996640c471f738e93b.zip | |
Use dhcp instead of dhcp3.
| -rw-r--r-- | scripts/dhcpv6-client-show-leases.pl | 4 | ||||
| -rwxr-xr-x | scripts/show-dhcp-leases.pl | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-show-dhclient.pl | 2 | ||||
| -rw-r--r-- | templates/release/dhcpv6/interface/node.tag/node.def | 4 | ||||
| -rw-r--r-- | templates/renew/dhcpv6/interface/node.tag/node.def | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/scripts/dhcpv6-client-show-leases.pl b/scripts/dhcpv6-client-show-leases.pl index 44be689..761a3e6 100644 --- a/scripts/dhcpv6-client-show-leases.pl +++ b/scripts/dhcpv6-client-show-leases.pl @@ -55,7 +55,7 @@ sub log_msg { # Main section. # -opendir (my $dir, "/var/lib/dhcp3"); +opendir (my $dir, "/var/lib/dhcp"); my @lease_files; while (my $f = readdir $dir) { if ($f =~ /^dhclient_v6_(\w+).leases$/) { @@ -74,7 +74,7 @@ my %ghash = (); foreach my $lease_filename (@lease_files) { my @lines=(); - open(my $f, '<', "/var/lib/dhcp3/$lease_filename") + open(my $f, '<', "/var/lib/dhcp/$lease_filename") or die "Can't open lease file for reading: $lease_filename\n"; @lines = <$f>; diff --git a/scripts/show-dhcp-leases.pl b/scripts/show-dhcp-leases.pl index a7a918a..431a13c 100755 --- a/scripts/show-dhcp-leases.pl +++ b/scripts/show-dhcp-leases.pl @@ -22,7 +22,7 @@ use strict; -opendir (my $dir, "/var/lib/dhcp3"); +opendir (my $dir, "/var/lib/dhcp"); my @leases; while (my $f = readdir $dir) { ($f =~ /^dhclient_([\w.]+)_lease$/) && push @leases, $1; diff --git a/scripts/vyatta-show-dhclient.pl b/scripts/vyatta-show-dhclient.pl index 5064c1c..40e284b 100755 --- a/scripts/vyatta-show-dhclient.pl +++ b/scripts/vyatta-show-dhclient.pl @@ -28,7 +28,7 @@ use POSIX; use strict; use warnings; -my $lease_dir = '/var/lib/dhcp3'; +my $lease_dir = '/var/lib/dhcp'; sub dhclient_get_lease_files { my ($intf) = @_; diff --git a/templates/release/dhcpv6/interface/node.tag/node.def b/templates/release/dhcpv6/interface/node.tag/node.def index 05f45c8..a8faa6c 100644 --- a/templates/release/dhcpv6/interface/node.tag/node.def +++ b/templates/release/dhcpv6/interface/node.tag/node.def @@ -2,8 +2,8 @@ help: Release DHCPv6 lease for interface allowed: local -a array - array=( /var/lib/dhcp3/dhclient_v6_*.conf ) - tail=${array[@]#/var/lib/dhcp3/dhclient_v6_} + array=( /var/lib/dhcp/dhclient_v6_*.conf ) + tail=${array[@]#/var/lib/dhcp/dhclient_v6_} ifnames=${tail[@]%.conf} echo -n ${ifnames[@]} diff --git a/templates/renew/dhcpv6/interface/node.tag/node.def b/templates/renew/dhcpv6/interface/node.tag/node.def index 2ef676d..9b5c191 100644 --- a/templates/renew/dhcpv6/interface/node.tag/node.def +++ b/templates/renew/dhcpv6/interface/node.tag/node.def @@ -2,8 +2,8 @@ help: Renew a DHCPv6 lease on an interface allowed: local -a array - array=( /var/lib/dhcp3/dhclient_v6_*.conf ) - tail=${array[@]#/var/lib/dhcp3/dhclient_v6_} + array=( /var/lib/dhcp/dhclient_v6_*.conf ) + tail=${array[@]#/var/lib/dhcp/dhclient_v6_} ifnames=${tail[@]%.conf} echo -n ${ifnames[@]} |