diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-08-30 15:28:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-30 15:28:20 +0200 |
| commit | cdc717da9f3d8c4ecce7f2117686ab317eb43bb8 (patch) | |
| tree | 12e5b0627b2ed7ceceaee0be552177d5b84ef15f /python/vyos | |
| parent | 147f655a69cd9526cd23f51ab18027cb5abc95b2 (diff) | |
| parent | 0aed0434cb118d3de068d3e3ab4dfb23abbf26a3 (diff) | |
| download | vyos-1x-cdc717da9f3d8c4ecce7f2117686ab317eb43bb8.tar.gz vyos-1x-cdc717da9f3d8c4ecce7f2117686ab317eb43bb8.zip | |
Merge pull request #983 from sever-sever/T3782
interface: T3782: Fix unexpected delete qdisc rule
Diffstat (limited to 'python/vyos')
| -rwxr-xr-x | 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 2a7b1eadc..04e139805 100755 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -1156,12 +1156,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: |