diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-03-18 03:52:39 +0500 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-03-18 03:52:39 +0500 |
| commit | c5e9e3caf9a67ed7e8a9c4ff09d2840a3b6115b4 (patch) | |
| tree | 70fae100cb6e7b666ac20d6fed8463d20567abde | |
| parent | 166b03e5044b5b5b02fbfe59c283ae24c7530a26 (diff) | |
| parent | fc00c2dc4513f0b52dba6a26ebdff7a918b3f420 (diff) | |
| download | vyatta-cfg-system-c5e9e3caf9a67ed7e8a9c4ff09d2840a3b6115b4.tar.gz vyatta-cfg-system-c5e9e3caf9a67ed7e8a9c4ff09d2840a3b6115b4.zip | |
Merge pull request #46 from kouak/bug508
Bug #508: Set correct dhclient configuration filename
3 files changed, 3 insertions, 3 deletions
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 86b5560f..31237d3b 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_$VAR(../@).conf + conffile=/var/lib/dhcp3/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 ef4c13ad..c5ecf92a 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_$VAR(../@).conf + conffile=/var/lib/dhcp3/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 86b5560f..31237d3b 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_$VAR(../@).conf + conffile=/var/lib/dhcp3/dhclient_v6_$ifname.conf if [ ! -e $conffile ]; then echo "Conf file $conffile doesn't exist" exit 0 |