Revert "- update kernel install script to write /etc/kernel/cmdline (#2161740)"

This reverts commit 77420b25d7.

Related: #2161740
This commit is contained in:
Dan Horák 2023-01-25 13:50:28 +01:00
parent 77420b25d7
commit 3eb7d4cf52
2 changed files with 13 additions and 11 deletions

View File

@ -76,20 +76,18 @@ case "$COMMAND" in
if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
declare -a BOOT_OPTIONS declare -a BOOT_OPTIONS
if [[ ! -f /etc/kernel/cmdline ]]; then
last=''
for entry in "${BLS_DIR}"/*.conf; do
last="$entry"
done
if [[ ! -z "$last" ]]; then
args="$(awk '/options/{$1="";$0=$0;$1=$1;print}' $last)"
echo "$args" > /etc/kernel/cmdline
fi
fi
if [[ -f /etc/kernel/cmdline ]]; then if [[ -f /etc/kernel/cmdline ]]; then
read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
fi fi
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
read -r -d '' -a line < /proc/cmdline
for i in "${line[@]}"; do
[[ "${i#initrd=*}" != "$i" || "${i#BOOT_IMAGE=*}" != "$i" ]] && continue
BOOT_OPTIONS+=("$i")
done
fi
if ! [[ ${BOOT_OPTIONS[*]} ]]; then if ! [[ ${BOOT_OPTIONS[*]} ]]; then
echo "Could not determine the kernel command line parameters." >&2 echo "Could not determine the kernel command line parameters." >&2
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2 echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2

View File

@ -10,7 +10,7 @@
Name: s390utils Name: s390utils
Summary: Utilities and daemons for IBM z Systems Summary: Utilities and daemons for IBM z Systems
Version: 2.25.0 Version: 2.25.0
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 2 Epoch: 2
License: MIT License: MIT
ExclusiveArch: s390 s390x ExclusiveArch: s390 s390x
@ -907,6 +907,10 @@ User-space development files for the s390/s390x architecture.
%changelog %changelog
* Wed Jan 25 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-3
- revert the last change
- Related: #2161740
* Thu Jan 19 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-2 * Thu Jan 19 2023 Dan Horák <dhorak@redhat.com> - 2:2.25.0-2
- update kernel install script to write /etc/kernel/cmdline (#2161740) - update kernel install script to write /etc/kernel/cmdline (#2161740)
- Resolves: #2161740 - Resolves: #2161740