rpms
/
s390utils
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Generate /etc/kernel/cmdline if it does not exist" 

This reverts commit 77693cd7eb.

Although it fixes the situation when a new kernel is being installed in
a %post script, it breaks the initial kernel installation, because the
BLS snippet doesn't exists yet.
This commit is contained in:
Dan Horák 2023-01-23 12:16:40 +00:00
parent 685ce32c07
commit 607a6825f4
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
20-zipl-kernel.install
View File

@ -76,24 +76,16 @@ case "$COMMAND" in
if [[ ! -f /sbin/new-kernel-pkg || -d "${BLS_DIR}" ]]; then
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
read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
fi
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
echo "Could not determine the kernel command line parameters." >&2
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
exit 1
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
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"

5
s390utils.spec
View File

@ -10,7 +10,7 @@
Name: s390utils
Summary: Utilities and daemons for IBM z Systems
Version: 2.25.0
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 2
License: MIT
ExclusiveArch: s390 s390x
@ -907,6 +907,9 @@ User-space development files for the s390/s390x architecture.
%changelog
* Mon Jan 23 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-3
- revert the kernel install script change
* Thu Jan 19 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-2
- update kernel install script to write /etc/kernel/cmdline