diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-08-31 11:01:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 11:01:02 +0200 |
| commit | 6bb9ad54739b0bfef7dcd93d3ad3391e9d472038 (patch) | |
| tree | a7c8ccb6111309095bbe821365de6a7e5fadc313 /python/vyos | |
| parent | 11fdcb7cdd078e67b460b6863f8fd9785c33dc2d (diff) | |
| parent | 4281fb32ebba0f1e0c76bf1f21eea7defe65a1a9 (diff) | |
| download | vyos-1x-6bb9ad54739b0bfef7dcd93d3ad3391e9d472038.tar.gz vyos-1x-6bb9ad54739b0bfef7dcd93d3ad3391e9d472038.zip | |
Merge pull request #985 from sever-sever/T3782-equ
interface: T3782: Fix unexpected delete qdisc rule
Diffstat (limited to 'python/vyos')
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index d47403488..c53bb964a 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -1079,12 +1079,14 @@ class Interface(Control): source_if = next(iter(self._config['is_mirror_intf'])) config = self._config['is_mirror_intf'][source_if].get('mirror', None) - # Please do not clear the 'set $? = 0 '. It's meant to force a return of 0 - # Remove existing mirroring rules - delete_tc_cmd = f'tc qdisc del dev {source_if} handle ffff: ingress 2> /dev/null;' - delete_tc_cmd += f'tc qdisc del dev {source_if} handle 1: root prio 2> /dev/null;' - delete_tc_cmd += 'set $?=0' - self._popen(delete_tc_cmd) + # Check configuration stored by old perl code before delete T3782 + if not 'redirect' in self._config: + # Please do not clear the 'set $? = 0 '. It's meant to force a return of 0 + # Remove existing mirroring rules + delete_tc_cmd = f'tc qdisc del dev {source_if} handle ffff: ingress 2> /dev/null;' + delete_tc_cmd += f'tc qdisc del dev {source_if} handle 1: root prio 2> /dev/null;' + delete_tc_cmd += 'set $?=0' + self._popen(delete_tc_cmd) # Bail out early if nothing needs to be configured if not config: |