diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 04:13:59 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 04:13:59 -0500 |
| commit | 8916fa69bdd7db82f8b4f669903fe2ab36b21e5b (patch) | |
| tree | 92caed55b5ba5d3f4bc25e40773f087b1f526b5a | |
| parent | cb23703a554a919d945bf0c96811b9676ba61cd9 (diff) | |
| download | vyatta-cfg-8916fa69bdd7db82f8b4f669903fe2ab36b21e5b.tar.gz vyatta-cfg-8916fa69bdd7db82f8b4f669903fe2ab36b21e5b.zip | |
Use dhcp instead of dhcp3.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | debian/vyatta-cfg.postinst.in | 2 | ||||
| -rwxr-xr-x | lib/Vyatta/Misc.pm | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-dhclient-hook | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index e277a99..019d283 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ initddir = /etc/init.d logrotatedir = /etc/logrotate.d defaultdir = /etc/default etc_shell_leveldir = $(sysconfdir)/shell/level -dhcphookdir = /etc/dhcp3/dhclient-exit-hooks.d +dhcphookdir = /etc/dhcp/dhclient-exit-hooks.d enumdir = $(datadir)/enumeration if USE_UNIONFSFUSE diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in index 527a744..111be91 100644 --- a/debian/vyatta-cfg.postinst.in +++ b/debian/vyatta-cfg.postinst.in @@ -20,7 +20,7 @@ update-rc.d vyatta-router defaults 90 >/dev/null if [ "$sysconfdir" != "/etc" ]; then # remove the config files and replace with blank ones - for conf in dhcp3/dhclient.conf + for conf in dhcp/dhclient.conf do [ -f /etc/$conf ] && mv -f /etc/$conf /etc/$conf.vyatta-save touch /etc/$conf diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm index d799d23..59aff2b 100755 --- a/lib/Vyatta/Misc.pm +++ b/lib/Vyatta/Misc.pm @@ -183,7 +183,7 @@ sub is_address_enabled { # return dhclient related files for interface sub generate_dhclient_intf_files { my $intf = shift; - my $dhclient_dir = '/var/lib/dhcp3/'; + my $dhclient_dir = '/var/lib/dhcp/'; $intf =~ s/\./_/g; my $intf_config_file = $dhclient_dir . 'dhclient_' . $intf . '.conf'; diff --git a/scripts/vyatta-dhclient-hook b/scripts/vyatta-dhclient-hook index 5784d93..dcd0664 100755 --- a/scripts/vyatta-dhclient-hook +++ b/scripts/vyatta-dhclient-hook @@ -23,7 +23,7 @@ RUN="yes" if [ "$RUN" = "yes" ]; then - LOG=/var/lib/dhcp3/dhclient_"$interface"_lease + LOG=/var/lib/dhcp/dhclient_"$interface"_lease echo `date` > $LOG for i in reason interface new_expiry new_dhcp_lease_time medium \ |