diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-03-03 15:28:13 +0500 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-03-03 15:28:13 +0500 |
| commit | 3f826974643212eb8ed779faed9b8ee236deada6 (patch) | |
| tree | 1d3340ae1b78813c282a9e01d0588445f4c35a40 /templates | |
| parent | b76a1920cff84fd14434aaf1c476450ed7da64b9 (diff) | |
| parent | 5b2e0c1603d5ba4567121c336fa0c63c736f7342 (diff) | |
| download | vyatta-cfg-system-3f826974643212eb8ed779faed9b8ee236deada6.tar.gz vyatta-cfg-system-3f826974643212eb8ed779faed9b8ee236deada6.zip | |
Merge pull request #43 from kouak/staged-to-vyos
Bug #385: Fix broken commit 6257dfa1464d460de74e258b6290d4890a885218
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vif/node.def | 6 | ||||
| l--------- | templates/service/dns/dynamic/interface/node.tag/service/sitelutions | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def index a1bd652b..b9925177 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.def @@ -6,12 +6,12 @@ syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 a val_help: u32:0-4094; VLAN ID create: if [ -n "$VAR(./egress-qos)" ]; then - opt-e=" egress-qos-map $VAR(./egress-qos/@) " + opt_e=" egress-qos-map $VAR(./egress-qos/@) " fi if [ -n "$VAR(./ingress-qos)" ]; then - opt-in=" ingress-qos-map $VAR(./ingress-qos/@) " + opt_in=" ingress-qos-map $VAR(./ingress-qos/@) " fi - if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) $opt-e $opt-in + if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) ${opt_e} ${opt_in} then echo "Error creating VLAN device $VAR(../@).$VAR(@)" exit 1 fi diff --git a/templates/service/dns/dynamic/interface/node.tag/service/sitelutions b/templates/service/dns/dynamic/interface/node.tag/service/sitelutions new file mode 120000 index 00000000..eb3f9cd2 --- /dev/null +++ b/templates/service/dns/dynamic/interface/node.tag/service/sitelutions @@ -0,0 +1 @@ +node.tag/
\ No newline at end of file |