10_linux.in: escape semicolon and ampersand on BLS upddate
Resolves: #RHEL-68531 Signed-off-by: Leo Sandoval <lsandova@redhat.com>
This commit is contained in:
parent
f9ffaac36e
commit
adaa841fca
@ -0,0 +1,31 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Marta Lewandowska <mlewando@redhat.com>
|
||||
Date: Thu, 21 Nov 2024 11:32:18 -0600
|
||||
Subject: [PATCH] 10_linux.in: escape semicolon and ampersand on BLS upddate
|
||||
|
||||
Besides escaping the character '/', escape ';' and '&' which may be set on on
|
||||
kernel parameters.
|
||||
|
||||
Resolves: #RHEL-68531
|
||||
Signed-off-by: Marta Lewandowska <mlewando@redhat.com>
|
||||
Reviewed-by: Leo Sandoval <lsandova@redhat.com>
|
||||
---
|
||||
util/grub.d/10_linux.in | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
mode change 100644 => 100755 util/grub.d/10_linux.in
|
||||
|
||||
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||
old mode 100644
|
||||
new mode 100755
|
||||
index 041a11529..7754ef853
|
||||
--- a/util/grub.d/10_linux.in
|
||||
+++ b/util/grub.d/10_linux.in
|
||||
@@ -176,6 +176,8 @@ update_bls_cmdline()
|
||||
options="${options} ${GRUB_CMDLINE_LINUX_DEBUG}"
|
||||
fi
|
||||
options="$(echo "${options}" | sed -e 's/\//\\\//g')"
|
||||
+ options="$(echo "${options}" | sed -e 's/\;/\\\;/g')"
|
||||
+ options="$(echo "${options}" | sed -e 's/\\&/\\\\&/g')"
|
||||
sed -i -e "s/^options.*/options ${options}/" "${blsdir}/${bls}.conf"
|
||||
done
|
||||
}
|
@ -278,3 +278,4 @@ Patch0277: 0277-Stop-grub.efi-from-always-printing-dynamic_load_symb.patch
|
||||
Patch0278: 0278-linuxefi-Invalidate-i-cache-before-starting-the-kern.patch
|
||||
Patch0279: 0279-grub-mkconfig-dont-overwrite-BLS-cmdline-if-BLSCFG.patch
|
||||
Patch0280: 0280-grub2-mkconfig-Pass-all-boot-params-when-used-by-ana.patch
|
||||
Patch0281: 0281-10_linux.in-escape-semicolon-and-ampersand-on-BLS-up.patch
|
@ -17,7 +17,7 @@
|
||||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.12
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
License: GPL-3.0-or-later
|
||||
URL: http://www.gnu.org/software/grub/
|
||||
@ -583,6 +583,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Nov 21 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-2
|
||||
- 10_linux.in: escape semicolon and ampersand on BLS upddate
|
||||
- Resolves: #RHEL-68531
|
||||
|
||||
* Wed Nov 6 2024 Leo Sandoval <lsandova@redhat.com> - 2.12-1
|
||||
- Rebased to release grub-2.12
|
||||
- Resolves: #RHEL-15032
|
||||
|
Loading…
Reference in New Issue
Block a user