From f068a031a820ae48426cb8c99e38a8873988a570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 14 Jun 2017 16:41:07 +0200 Subject: [PATCH] bootloader: split string for removal from cmdline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#1461279 Signed-off-by: Jaroslav Škarvada --- tuned/plugins/plugin_bootloader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tuned/plugins/plugin_bootloader.py b/tuned/plugins/plugin_bootloader.py index 44501083..00e1b12d 100644 --- a/tuned/plugins/plugin_bootloader.py +++ b/tuned/plugins/plugin_bootloader.py @@ -72,8 +72,9 @@ def _get_effective_options(self, options): if op == "+" and vals != "": cmdline += " " + vals elif op == "-" and vals != "": - regex = re.escape(vals) - cmdline = re.sub(r"(\A|\s)" + regex + r"(?=\Z|\s)", r"", cmdline) + for p in vals.split(): + regex = re.escape(p) + cmdline = re.sub(r"(\A|\s)" + regex + r"(?=\Z|\s)", r"", cmdline) else: cmdline += " " + val cmdline = cmdline.strip()