diff options
| author | Daniil Baturin <daniil@vyos.io> | 2021-02-22 17:04:15 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2021-02-22 17:04:15 +0200 |
| commit | bdc35ac8ad1d3d88c796aa488749e44bda617b44 (patch) | |
| tree | b2c97b7ab02aa6c3c3ed27cb98e46302f797c909 /python/vyos/ifconfig/interface.py | |
| parent | 28cd2e3edb3e2108c43ad20c0084d496a7ffef25 (diff) | |
| parent | cf1156a60e1d03a752cde0baadbc9ac8118b2a52 (diff) | |
| download | vyos-1x-bdc35ac8ad1d3d88c796aa488749e44bda617b44.tar.gz vyos-1x-bdc35ac8ad1d3d88c796aa488749e44bda617b44.zip | |
Merge branch 'current' of https://github.com/vyos/vyos-1x into current
Diffstat (limited to 'python/vyos/ifconfig/interface.py')
| -rw-r--r-- | python/vyos/ifconfig/interface.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py index 8528c4a81..d9507d816 100644 --- a/python/vyos/ifconfig/interface.py +++ b/python/vyos/ifconfig/interface.py @@ -1015,9 +1015,11 @@ 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; ' - delete_tc_cmd += f'tc qdisc del dev {source_if} handle 1: root prio' + 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 |