summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-08 21:05:15 +0100
committerGitHub <noreply@github.com>2024-02-08 21:05:15 +0100
commitdfd911ff993481fd89845e2b700431eea56d3275 (patch)
treeb65370999b3255f1dfdbb56a210963e0dd45b07d
parentec60a936645a22050db1550de12ca1fbb63abfbe (diff)
parent70d4dafa4367183360d7c8add8221ab99ee767e5 (diff)
downloadvyos-1x-dfd911ff993481fd89845e2b700431eea56d3275.tar.gz
vyos-1x-dfd911ff993481fd89845e2b700431eea56d3275.zip
Merge pull request #2971 from vyos/mergify/bp/sagitta/pr-2969
T6026: QoS hide attempts to delete qdisc from devices (backport #2969)
-rwxr-xr-xsrc/conf_mode/qos.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/qos.py b/src/conf_mode/qos.py
index 40d7a6c16..4a0b4d0c5 100755
--- a/src/conf_mode/qos.py
+++ b/src/conf_mode/qos.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -36,7 +36,7 @@ from vyos.qos import RateLimiter
from vyos.qos import RoundRobin
from vyos.qos import TrafficShaper
from vyos.qos import TrafficShaperHFSC
-from vyos.utils.process import call
+from vyos.utils.process import run
from vyos.utils.dict import dict_search_recursive
from vyos import ConfigError
from vyos import airbag
@@ -205,8 +205,8 @@ def apply(qos):
# Always delete "old" shapers first
for interface in interfaces():
# Ignore errors (may have no qdisc)
- call(f'tc qdisc del dev {interface} parent ffff:')
- call(f'tc qdisc del dev {interface} root')
+ run(f'tc qdisc del dev {interface} parent ffff:')
+ run(f'tc qdisc del dev {interface} root')
call_dependents()