diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
| commit | bacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch) | |
| tree | 2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /templates/interfaces/bonding | |
| parent | 0d8e75e2e808ccf366a1527647a6353c09d92237 (diff) | |
| parent | 0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff) | |
| download | vyatta-cfg-system-lithium.tar.gz vyatta-cfg-system-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
scripts/snmp/vyatta-snmp-v3.pl
scripts/snmp/vyatta-snmp.pl
templates/interfaces/tunnel/node.def
templates/system/sysctl/custom/node.def
Diffstat (limited to 'templates/interfaces/bonding')
4 files changed, 4 insertions, 4 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 |