Blame SOURCES/tuned-2.18.0-bootloader-initrd-no-dev-hardcode.patch
|
 |
2ee7f4 |
From f23ff066327c3212faee6bed2c6f8d2a43c9db5f Mon Sep 17 00:00:00 2001
|
|
|
2ee7f4 |
From: Jan Zerdik <jzerdik@redhat.com>
|
|
|
2ee7f4 |
Date: Mon, 7 Mar 2022 12:21:59 +0100
|
|
|
2ee7f4 |
Subject: [PATCH] Do not hardcode disk name in tuned initrd path.
|
|
|
2ee7f4 |
|
|
|
2ee7f4 |
Cleaner solution by jskarvad@redhat.com
|
|
|
2ee7f4 |
|
|
|
2ee7f4 |
Resolves: rhbz#2050246
|
|
|
2ee7f4 |
|
|
|
2ee7f4 |
Signed-off-by: Jan Zerdik <jzerdik@redhat.com>
|
|
|
2ee7f4 |
---
|
|
|
2ee7f4 |
tuned/plugins/plugin_bootloader.py | 2 +-
|
|
|
2ee7f4 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
2ee7f4 |
|
|
|
2ee7f4 |
diff --git a/tuned/plugins/plugin_bootloader.py b/tuned/plugins/plugin_bootloader.py
|
|
|
2ee7f4 |
index 32dd35d..ad2d4d5 100644
|
|
|
2ee7f4 |
--- a/tuned/plugins/plugin_bootloader.py
|
|
|
2ee7f4 |
+++ b/tuned/plugins/plugin_bootloader.py
|
|
|
2ee7f4 |
@@ -395,7 +395,7 @@ class BootloaderPlugin(base.Plugin):
|
|
|
2ee7f4 |
initrd_grubpath = "/"
|
|
|
2ee7f4 |
lc = len(curr_cmdline)
|
|
|
2ee7f4 |
if lc:
|
|
|
2ee7f4 |
- path = re.sub(r"^\s*BOOT_IMAGE=\s*(\S*/).*$", "\\1", curr_cmdline)
|
|
|
2ee7f4 |
+ path = re.sub(r"^\s*BOOT_IMAGE=\s*(?:\([^)]*\))?(\S*/).*$", "\\1", curr_cmdline)
|
|
|
2ee7f4 |
if len(path) < lc:
|
|
|
2ee7f4 |
initrd_grubpath = path
|
|
|
2ee7f4 |
self._initrd_val = os.path.join(initrd_grubpath, img_name)
|
|
|
2ee7f4 |
--
|
|
|
2ee7f4 |
2.35.3
|
|
|
2ee7f4 |
|