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

Do not set root with not copying default

Browse Source
This commit is contained in:
Marta Lewandowska 2023-02-21 19:33:02 +01:00 committed by Robbie Harwood
parent d696710922
commit 8656bfd565
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grubby-bls
View File

@ -827,13 +827,16 @@ fi
remove_var_prefix "$(get_prefix)" remove_var_prefix "$(get_prefix)"
if [[ -n $kernel ]]; then if [[ -n $kernel ]]; then
if [[ $copy_default = "true" ]]; then
opts="${bls_options[$default_index]}" opts="${bls_options[$default_index]}"
if [[ $copy_default != "true" ]]; then
opts=$(echo $opts | sed -e 's/ .*//')
fi
if [[ -n $args ]]; then if [[ -n $args ]]; then
opts="${opts} ${args}" opts="${opts} ${args}"
fi fi
else
opts="${opts} ${args}"
remove_args="$kernelopts"
update_args "${opts}" "${remove_args}" ""
fi
add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \ add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \
"${extra_initrd}" "${extra_initrd}"

5
grubby.spec
View File

@ -3,7 +3,7 @@
Name: grubby Name: grubby
Version: 8.40 Version: 8.40
Release: 69%{?dist} Release: 70%{?dist}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
License: GPLv2+ License: GPLv2+
Source1: grubby-bls Source1: grubby-bls
@ -77,6 +77,9 @@ fi
%{_mandir}/man8/grubby.8* %{_mandir}/man8/grubby.8*
%changelog %changelog
* Tue Feb 21 2023 Marta Lewandowska <mlewando@redhat.com> - 8.40-70
- remove root= when not copying default
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.40-69 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.40-69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild