diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2007-12-12 20:12:56 -0800 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2007-12-12 20:12:56 -0800 |
| commit | ccc86da96be587935f616ce5ce8715c67f6d2f87 (patch) | |
| tree | ccce5e903de713d790d9d11b07bd590b9bc4c92b /templates/protocols/ospf/distance | |
| parent | 51e5d904b6a51ed07a0eaeda12c1d15c1f6a8c0a (diff) | |
| download | vyatta-cfg-quagga-ccc86da96be587935f616ce5ce8715c67f6d2f87.tar.gz vyatta-cfg-quagga-ccc86da96be587935f616ce5ce8715c67f6d2f87.zip | |
Add wrapper script between cfg templates and vtysh. The wrapper will:
- log commands to /tmp/vtysh.log
- return error code when quagga responds with an errmsg
- ignore errors when called with -n
Diffstat (limited to 'templates/protocols/ospf/distance')
| -rw-r--r-- | templates/protocols/ospf/distance/global/node.def | 4 | ||||
| -rw-r--r-- | templates/protocols/ospf/distance/ospf/node.def | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def index 6b45a976..d88a761b 100644 --- a/templates/protocols/ospf/distance/global/node.def +++ b/templates/protocols/ospf/distance/global/node.def @@ -1,9 +1,9 @@ type: u32 help: "OSPF administrative distance" syntax: $(@) >= 1 && $(@) <= 255; "Must be between 1-255" -update: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \ +update: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"distance $(@) \"; " -delete: "/usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \ +delete: "\\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"no distance $(@) \"; " diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def index cd64dd88..fa49eaa1 100644 --- a/templates/protocols/ospf/distance/ospf/node.def +++ b/templates/protocols/ospf/distance/ospf/node.def @@ -1,7 +1,7 @@ help: "OSPF administrative distance" delete: "touch /tmp/ospf-distance.\\$PPID" end: "if [ -f \"/tmp/ospf-distance.\\$PPID\" ]; then \ - /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \ + \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"no distance ospf\"; \ rm /tmp/ospf-distance.\\$PPID; \ else \ @@ -14,6 +14,6 @@ end: "if [ -f \"/tmp/ospf-distance.\\$PPID\" ]; then \ if [ -n \"$(./external/@)\" ]; then \ PARM=\"\\$PARM external $(./external/@)\"; \ fi; \ - /usr/bin/vtysh -c \"configure terminal\" -c \"router ospf\" \ + \\${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \ -c \"no distance ospf\" -c \"distance ospf \\$PARM\"; \ fi; " |