diff options
| author | John Southworth <john.southworth@vyatta.com> | 2012-03-21 16:53:11 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-03-21 16:53:11 -0700 |
| commit | 45f98392bbcd39e3fbd5a96b2f661e5d0b3416ca (patch) | |
| tree | 66278d455e95477be6342ff968973cd48df20959 | |
| parent | 8ac0117db9be42bae3279c1236767b0e733ce10c (diff) | |
| download | vyatta-cfg-qos-45f98392bbcd39e3fbd5a96b2f661e5d0b3416ca.tar.gz vyatta-cfg-qos-45f98392bbcd39e3fbd5a96b2f661e5d0b3416ca.zip | |
remove manually created vrrp nodes
3 files changed, 1 insertions, 34 deletions
diff --git a/debian/rules b/debian/rules index df2609a..71ee7fd 100755 --- a/debian/rules +++ b/debian/rules @@ -48,6 +48,7 @@ clean-patched: dh_testroot if test -f Makefile ; then $(MAKE) clean distclean ; fi rm -f build-stamp + rm -rf generated-templates/ rm -f config.status config.sub config.guess config.log rm -f aclocal.m4 configure Makefile.in Makefile INSTALL rm -rf config diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/mirror/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/mirror/node.def deleted file mode 100644 index 0b2ca8c..0000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/mirror/node.def +++ /dev/null @@ -1,17 +0,0 @@ -priority: 820 -type: txt -help: Incoming packet mirroring destination -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show=ethernet - -val_help: Interface for packet mirroring - -commit:expression: $VAR(../redirect) == ""; \ - "interface $VAR(../../../../@)v$VAR(../../@) : can not do both redirect and mirror" - -commit:expression: $VAR(../traffic-policy/in) == ""; \ - "interface $VAR(../../../../@)v$VAR(../../@) : can not use ingress policy and mirror" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --check=all" - -update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $VAR(../../../../@)v$VAR(../../@) -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $VAR(../../../../@)v$VAR(../../@) diff --git a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/redirect/node.def b/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/redirect/node.def deleted file mode 100644 index fcaaf15..0000000 --- a/templates/interfaces/ethernet/node.tag/vrrp/vrrp-group/node.tag/interface/redirect/node.def +++ /dev/null @@ -1,17 +0,0 @@ -priority: 820 # after vrrp -type: txt -help: Incoming packet redirection destination -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=input - -val_help: Interface for packet redirection - -commit:expression: $VAR(../mirror) == "";\ - "interface $VAR(../../../../@)v$VAR(../../@) : can not do both redirect and mirror" - -commit:expression: $VAR(../traffic-policy/in) == ""; \ - "interface $VAR(../../../../@)v$VAR(../../@) : can not use ingress policy and redirect" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --check=all" - -update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $VAR(../../../../@)v$VAR(../../@) -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $VAR(../../../../@)v$VAR(../../@) |