diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 02:08:23 -0500 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-02-09 02:08:23 -0500 |
| commit | 9d0c8946c537a1d857df67be2ffc26255c24bdbb (patch) | |
| tree | 325ed1ddb0a0a26560f1056cd4b00f9001cc99d9 /templates/interfaces | |
| parent | 08ec1c93a80be4b4dcec5d4fa4723133225b1367 (diff) | |
| download | vyatta-cfg-system-9d0c8946c537a1d857df67be2ffc26255c24bdbb.tar.gz vyatta-cfg-system-9d0c8946c537a1d857df67be2ffc26255c24bdbb.zip | |
Use directory /var/lib/dhcp instead of /var/lib/dhcp3.
Use directory /etc/dhcp instead of /etc/dhcp3.
Diffstat (limited to 'templates/interfaces')
14 files changed, 14 insertions, 14 deletions
diff --git a/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def index 225bd926..d25533f9 100644 --- a/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def @@ -27,7 +27,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def index 86b5560f..d6fea411 100644 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def index ef4c13ad..0be14824 100644 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def index 81e7055d..41975dea 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def index 225bd926..d25533f9 100644 --- a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def @@ -27,7 +27,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def index 225bd926..d25533f9 100644 --- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def @@ -27,7 +27,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def index 31237d3b..9116b354 100644 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$ifname.conf + conffile=/var/lib/dhcp/dhclient_v6_$ifname.conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def index c5ecf92a..ddebe05b 100644 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$ifname.conf + conffile=/var/lib/dhcp/dhclient_v6_$ifname.conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def index 31237d3b..9116b354 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$ifname.conf + conffile=/var/lib/dhcp/dhclient_v6_$ifname.conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def index 225bd926..d25533f9 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def @@ -27,7 +27,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def index 86b5560f..d6fea411 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def index ef4c13ad..0be14824 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def index 86b5560f..d6fea411 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def @@ -26,7 +26,7 @@ end: exit 0 fi - conffile=/var/lib/dhcp3/dhclient_v6_$VAR(../@).conf + conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 diff --git a/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def b/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def index 60fbae34..de0450d7 100644 --- a/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def +++ b/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def @@ -2,7 +2,7 @@ type: txt help: DHCP interface that supplies the local IP address for this tunnel 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-tunnel.pl --interface=$VAR(@) --tunnel=$VAR(../@) --option=create |