Compare commits
No commits in common. "imports/c8-beta/grubby-8.40-45.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
@ -1 +0,0 @@
|
||||||
97ae8d113b74538c05f05083dcff4f44012fd0cd SOURCES/8.40-1.tar.gz
|
|
|
@ -500,7 +500,7 @@ update_bls_fragment() {
|
||||||
if [[ -n $old_args ]]; then
|
if [[ -n $old_args ]]; then
|
||||||
opts="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
|
opts="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
|
||||||
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -511,24 +511,6 @@ update_bls_fragment() {
|
||||||
fi
|
fi
|
||||||
elif [[ $bootloader = grub2 ]]; then
|
elif [[ $bootloader = grub2 ]]; then
|
||||||
opts="$(grub2-editenv "${env}" list | grep kernelopts | sed -e "s/kernelopts=//")"
|
opts="$(grub2-editenv "${env}" list | grep kernelopts | sed -e "s/kernelopts=//")"
|
||||||
elif [[ $bootloader = zipl ]]; then
|
|
||||||
if [[ ! -f /etc/kernel/cmdline ]]; then
|
|
||||||
# anaconda could create this, but we'd just end up in the same
|
|
||||||
# place.
|
|
||||||
sed 's/BOOT_IMAGE=[^ ]*//' /proc/cmdline > /etc/kernel/cmdline
|
|
||||||
fi
|
|
||||||
if [[ $param = "ALL" ]] && [[ -n $remove_args || -n $add_args ]]; then
|
|
||||||
read old_args < /etc/kernel/cmdline
|
|
||||||
opts="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
|
|
||||||
echo "$opts" > /etc/kernel/cmdline
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ $bootloader = grub2 ]] && [[ ! -f /etc/kernel/cmdline ]]; then
|
|
||||||
opts=$(grub2-editenv "${env}" list | grep kernelopts | sed 's/kernelopts=//')
|
|
||||||
if [[ -n $opts ]]; then
|
|
||||||
echo "opts" > /etc/kernel/cmdline
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in ${indexes[*]}; do
|
for i in ${indexes[*]}; do
|
||||||
|
@ -550,6 +532,20 @@ update_bls_fragment() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if [[ $param = "ALL" ]] && [[ -n $remove_args || -n $add_args ]]; then
|
||||||
|
if [[ ! -f /etc/kernel/cmdline ]]; then
|
||||||
|
# anaconda could pre-populate this file, but until then, most of
|
||||||
|
# the time we'll just want the most recent one. This is pretty
|
||||||
|
# close to the current almost-correct behavior of falling back to
|
||||||
|
# /proc/cmdline anyhow.
|
||||||
|
echo "$(get_bls_args -1)" > /etc/kernel/cmdline
|
||||||
|
fi
|
||||||
|
|
||||||
|
read old_args < /etc/kernel/cmdline
|
||||||
|
local new_args="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
|
||||||
|
echo "$new_args" > /etc/kernel/cmdline
|
||||||
|
fi
|
||||||
|
|
||||||
update_grubcfg
|
update_grubcfg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -816,7 +812,9 @@ if [[ -n $kernel ]]; then
|
||||||
opts="${opts} ${args}"
|
opts="${opts} ${args}"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
opts="${args}"
|
opts="${opts} ${args}"
|
||||||
|
remove_args="$kernelopts"
|
||||||
|
update_args "${opts}" "${remove_args}" ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \
|
add_bls_fragment "${kernel}" "${title}" "${opts}" "${initrd}" \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Name: grubby
|
Name: grubby
|
||||||
Version: 8.40
|
Version: 8.40
|
||||||
Release: 45%{?dist}
|
Release: 49%{?dist}
|
||||||
Summary: Command line tool for updating BootLoaderSpec files
|
Summary: Command line tool for updating BootLoaderSpec files
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/rhinstaller/grubby
|
URL: https://github.com/rhinstaller/grubby
|
||||||
|
@ -169,6 +169,22 @@ current boot environment.
|
||||||
%{_mandir}/man8/*.8*
|
%{_mandir}/man8/*.8*
|
||||||
|
|
||||||
%changelog
|
%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
|
||||||
|
|
||||||
|
* Thu Oct 06 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-46
|
||||||
|
- Fix quoting of opts in grubby-bls
|
||||||
|
- Resolves: #2129740
|
||||||
|
|
||||||
* Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-44
|
* Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-44
|
||||||
- Write to /etc/kernel/cmdline on non-s390x also
|
- Write to /etc/kernel/cmdline on non-s390x also
|
||||||
- Resolves: #1978226
|
- Resolves: #1978226
|
||||||
|
|
Loading…
Reference in New Issue