diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 04:31:39 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 04:31:39 -0500 |
| commit | 67b61011221cf658948c5f0f3157bf73d4d9c6da (patch) | |
| tree | 6c59153199c86935f639d5f69098668c596e39a8 | |
| parent | 3476bfd882dfa4aee2d016dc0242fbe135c0ab92 (diff) | |
| download | vyatta-cfg-quagga-67b61011221cf658948c5f0f3157bf73d4d9c6da.tar.gz vyatta-cfg-quagga-67b61011221cf658948c5f0f3157bf73d4d9c6da.zip | |
Use dhcp instead of dhcp3.
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vyatta-update-static-route.pl b/scripts/vyatta-update-static-route.pl index d50d25c6..c1c35bf8 100755 --- a/scripts/vyatta-update-static-route.pl +++ b/scripts/vyatta-update-static-route.pl @@ -13,7 +13,7 @@ GetOptions("interface=s" => \$iface, ); my $hash = `echo $iface $route $table | md5sum | cut -c1-10`; chomp $hash; -my $FILE_DHCP_HOOK = "/etc/dhcp3/dhclient-exit-hooks.d/static-route-$hash"; +my $FILE_DHCP_HOOK = "/etc/dhcp/dhclient-exit-hooks.d/static-route-$hash"; my $dhcp_hook = ''; if ($option eq 'create') { $dhcp_hook =<<EOS; diff --git a/templates/protocols/static/route/node.tag/dhcp-interface/node.def b/templates/protocols/static/route/node.tag/dhcp-interface/node.def index 3952233d..db83853d 100644 --- a/templates/protocols/static/route/node.tag/dhcp-interface/node.def +++ b/templates/protocols/static/route/node.tag/dhcp-interface/node.def @@ -2,7 +2,7 @@ type: txt help: DHCP interface that supplies the next-hop IP address for this static route allowed: local -a array ; - array=( /var/lib/dhcp3/eth* /var/lib/dhcp3/br* /var/lib/dhcp3/bond* ) ; + array=( /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; echo -n ${array[@]##*/} create: sudo /opt/vyatta/sbin/vyatta-update-static-route.pl --interface=$VAR(@) --route=$VAR(../@) --table=main --option=create diff --git a/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def b/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def index cef919eb..a86628ae 100644 --- a/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def +++ b/templates/protocols/static/table/node.tag/route/node.tag/dhcp-interface/node.def @@ -2,7 +2,7 @@ type: txt help: DHCP interface that supplies the next-hop IP address for this static route allowed: local -a array ; - array=( /var/lib/dhcp3/eth* /var/lib/dhcp3/br* /var/lib/dhcp3/bond* ) ; + array=( /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; echo -n ${array[@]##*/} create: ifc="$VAR(@)" |