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:
parent
685ce32c07
commit
607a6825f4
@ -76,24 +76,16 @@ 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
|
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||||
echo "Could not determine the kernel command line parameters." >&2
|
read -r -d '' -a line < /proc/cmdline
|
||||||
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
for i in "${line[@]}"; do
|
||||||
exit 1
|
[[ "${i#initrd=*}" != "$i" || "${i#BOOT_IMAGE=*}" != "$i" ]] && continue
|
||||||
|
BOOT_OPTIONS+=("$i")
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
|
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
|
||||||
|
@ -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,9 @@ User-space development files for the s390/s390x architecture.
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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
|
- update kernel install script to write /etc/kernel/cmdline
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user