diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-04-27 19:05:04 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-04-27 19:05:04 -0700 |
| commit | da2f87025f22db0e357b5437ae7d4baf57717fbd (patch) | |
| tree | 122b24b73b6d25560ba83b4834ccf61142d98f09 | |
| parent | 492a1b10e5921d3814eb9ef9a741899ffb6f0a6c (diff) | |
| parent | 3cc5d784f43768b983ef7429a78a9e244beea613 (diff) | |
| download | vyatta-cfg-quagga-da2f87025f22db0e357b5437ae7d4baf57717fbd.tar.gz vyatta-cfg-quagga-da2f87025f22db0e357b5437ae7d4baf57717fbd.zip | |
Merge commit 'origin/glendale' into hollywood
Conflicts:
templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/disable-link-detect/node.def | 10 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def index 7cc1de37..601e61d4 100644 --- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def @@ -1,6 +1,8 @@ help: Set to ignore link state changes on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../@)\" \ - -c \"no link-detect\" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../@)\" \ - -c \"link-detect \" +update:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + -c "interface $VAR(../@)" \ + -c "no link-detect" +delete:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + -c "interface $VAR(../@)" \ + -c "link-detect" diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def index 64a9b06a..89c27640 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def @@ -1,7 +1,9 @@ help: Set to ignore link state changes on this interface -update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../@).$VAR(../@)\" \ - -c \"no link-detect\" +update:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal\" \ + -c "interface $VAR(../../@).$VAR(../@)" \ + -c "no link-detect" -delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"interface $VAR(../../@).$VAR(../@)\" \ - -c \"link-detect\" +delete:${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \ + -c "interface $VAR(../../@).$VAR(../@)" \ + -c "link-detect" |