rpms/grubby
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Sync args changes with 8.40-66.fc38

Browse Source 
Resolves: #1969362
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-08-25 17:08:12 +00:00
parent c1550de84a
commit c27471ab63
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grubby-bls
View File

@ -502,16 +502,6 @@ update_bls_fragment() {
opts="$(echo "$opts" | sed -e 's/\//\\\//g')" 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
if [[ -f /etc/kernel/cmdline ]]; then
sed -i "s/\(root=[^ ]*\) .*/\1 ${opts}/" /etc/kernel/cmdline
else
# grub2-mkconfig creates this. Do that now.
grub2-mkconfig -o /etc/grub2.cfg
fi
if [[ ! -f /etc/kernel/cmdline ]]; then
echo "No /etc/kernel/cmdline; please report a bug";
fi
fi fi
old_args="$(grub2-editenv "${env}" list | grep kernelopts | sed -e "s/kernelopts=//")" old_args="$(grub2-editenv "${env}" list | grep kernelopts | sed -e "s/kernelopts=//")"
@ -538,7 +528,7 @@ update_bls_fragment() {
fi fi
done done
if [[ $param = "ALL" && $bootloader = zipl ]] && [[ -n $remove_args || -n $add_args ]]; then if [[ $param = "ALL" ]] && [[ -n $remove_args || -n $add_args ]]; then
if [[ ! -f /etc/kernel/cmdline ]]; then if [[ ! -f /etc/kernel/cmdline ]]; then
# anaconda could pre-populate this file, but until then, most of # anaconda could pre-populate this file, but until then, most of
# the time we'll just want the most recent one. This is pretty # the time we'll just want the most recent one. This is pretty

6
grubby.spec
View File

@ -1,6 +1,6 @@
Name: grubby Name: grubby
Version: 8.40 Version: 8.40
Release: 60%{?dist} Release: 61%{?dist}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
License: GPLv2+ License: GPLv2+
URL: https://github.com/rhinstaller/grubby URL: https://github.com/rhinstaller/grubby
@ -131,6 +131,10 @@ current boot environment.
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
%changelog %changelog
* Thu Aug 25 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-61
- Sync args changes with 8.40-66.fc38
- Resolves: #1969362
* Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-60 * Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-60
- Handle updating /etc/kernel/cmdline - Handle updating /etc/kernel/cmdline
- Resolves: #1969362 - Resolves: #1969362