Import from AlmaLinux stable repository

This commit is contained in:
eabdullin 2024-05-31 16:42:32 +00:00
parent 280685e9ea
commit 3eec94658c
3 changed files with 13 additions and 4 deletions

View File

@ -1 +0,0 @@
97ae8d113b74538c05f05083dcff4f44012fd0cd SOURCES/8.40-1.tar.gz

View File

@ -500,7 +500,7 @@ update_bls_fragment() {
if [[ -n $old_args ]]; then
opts="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
opts="$(echo "$opts" | sed -e 's/\//\\\//g')"
sed -i -e "s/^GRUB_CMDLINE_LINUX.*/GRUB_CMDLINE_LINUX=\\\"${opts}\\\"/" "${grub_etc_default}"
sed -i -e "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\\\"${opts}\\\"/" "${grub_etc_default}"
fi
fi
@ -812,7 +812,9 @@ if [[ -n $kernel ]]; then
opts="${opts} ${args}"
fi
else
opts="${args}"
opts="${opts} ${args}"
remove_args="$kernelopts"
update_args "${opts}" "${remove_args}" ""
fi
add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \

View File

@ -1,6 +1,6 @@
Name: grubby
Version: 8.40
Release: 47%{?dist}
Release: 49%{?dist}
Summary: Command line tool for updating BootLoaderSpec files
License: GPLv2+
URL: https://github.com/rhinstaller/grubby
@ -169,6 +169,14 @@ current boot environment.
%{_mandir}/man8/*.8*
%changelog
* Wed Jan 10 2024 Marta Lewandowska <mlewando@redhat.com> - 8.40-49
- Do not overwrite all vars that start with GRUB_CMDLINE_LINUX
- Resolves: #RHEL-12853
* Tue Feb 21 2023 Marta Lewandowska <mlewando@redhat.com> - 8.40-48
- Apply Marta's default args fix
- Resolves: #1900829
* Mon Oct 10 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-47
- Backport fedora/rhel9 initial cmdline population
- Resolves: #2129740