mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 17 Jan 2019 13:10:39 -0500
|
|
Subject: [PATCH] Make it possible to subtract conditions from debug=
|
|
|
|
This makes it so you can do set debug to "all,-scripting,-lexer" and get the
|
|
obvious outcome. Any negation present will take preference over that
|
|
conditional, so "all,-scripting,scripting" is the same thing as
|
|
"all,-scripting".
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/kern/misc.c | 14 +++++++++++++-
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
|
|
index aaae9aa0ab7..f6eaa7b4df8 100644
|
|
--- a/grub-core/kern/misc.c
|
|
+++ b/grub-core/kern/misc.c
|
|
@@ -163,12 +163,24 @@ int
|
|
grub_debug_enabled (const char * condition)
|
|
{
|
|
const char *debug;
|
|
+ char *negcond;
|
|
+ int negated = 0;
|
|
|
|
debug = grub_env_get ("debug");
|
|
if (!debug)
|
|
return 0;
|
|
|
|
- if (grub_strword (debug, "all") || grub_strword (debug, condition))
|
|
+ negcond = grub_zalloc (grub_strlen (condition) + 2);
|
|
+ if (negcond)
|
|
+ {
|
|
+ grub_strcpy (negcond, "-");
|
|
+ grub_strcpy (negcond+1, condition);
|
|
+ negated = grub_strword (debug, negcond);
|
|
+ grub_free (negcond);
|
|
+ }
|
|
+
|
|
+ if (!negated &&
|
|
+ (grub_strword (debug, "all") || grub_strword (debug, condition)))
|
|
return 1;
|
|
|
|
return 0;
|