From cc536faf67c5c1a363a5eb9ceda6161e0e6cc6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Tue, 31 May 2022 11:53:12 +0000
Subject: [PATCH] - do not fail on emtpy /proc/cmdline when installing kernel
 (#1899759)

---
 20-zipl-kernel.install | 6 ------
 52-zipl-rescue.install | 6 ------
 s390utils.spec         | 5 ++++-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/20-zipl-kernel.install b/20-zipl-kernel.install
index 3487aa2..4fadd1d 100755
--- a/20-zipl-kernel.install
+++ b/20-zipl-kernel.install
@@ -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
diff --git a/52-zipl-rescue.install b/52-zipl-rescue.install
index dbf0c1b..8acfbe0 100755
--- a/52-zipl-rescue.install
+++ b/52-zipl-rescue.install
@@ -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}"
diff --git a/s390utils.spec b/s390utils.spec
index 79fbccc..d85d6b5 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -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