From c117a1fdda0824456c5018b12da1eb77e8a1b461 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Thu, 30 Sep 2021 08:15:48 +0200 Subject: grub_plugin.py: set grub option systemd.show_status only once These items are fixed with this change: - "systemd.show_status=true" is always added, even if it was turned off later on. - If the option quiet is selected, then "systemd.show_status=false" is added twice instead of only once. With this patch "systemd.show_status" is only set once with either the value "true" or "false". Signed-off-by: Florian La Roche --- vmdb/plugins/grub_plugin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vmdb/plugins/grub_plugin.py b/vmdb/plugins/grub_plugin.py index 5b2e43d..469bd50 100644 --- a/vmdb/plugins/grub_plugin.py +++ b/vmdb/plugins/grub_plugin.py @@ -187,7 +187,6 @@ class GrubStepRunner(vmdb.StepRunnerInterface): "biosdevname=0", "net.ifnames=0", "consoleblank=0", - "systemd.show_status=true", "rw", ] if console == "serial": @@ -210,7 +209,12 @@ class GrubStepRunner(vmdb.StepRunnerInterface): "quiet", "systemd.show_status=false", "rd.systemd.show_status=false", - "systemd.show_status=false", + ] + ) + else: + kernel_params.extend( + [ + "systemd.show_status=true", ] ) -- cgit v1.2.1