- do not fail on emtpy /proc/cmdline when installing kernel (#1899759)

This commit is contained in:
Dan Horák 2022-05-31 11:53:12 +00:00
parent f7710610d8
commit cc536faf67
3 changed files with 4 additions and 13 deletions

View File

@ -88,12 +88,6 @@ case "$COMMAND" in
done
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
fi
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then

View File

@ -29,12 +29,6 @@ case "$COMMAND" in
done
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
fi
BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"

View File

@ -10,7 +10,7 @@
Name: s390utils
Summary: Utilities and daemons for IBM z Systems
Version: 2.21.0
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 2
License: MIT
ExclusiveArch: s390 s390x
@ -886,6 +886,9 @@ User-space development files for the s390/s390x architecture.
%changelog
* Tue May 31 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-2
- do not fail on emtpy /proc/cmdline when installing kernel (#1899759)
* Fri Apr 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-1
- rebased to 2.21.0