From 77420b25d7f2b9d689ef6e597585a30427ced920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dhorak@redhat.com>
Date: Thu, 19 Jan 2023 12:22:49 +0100
Subject: [PATCH] - update kernel install script to write /etc/kernel/cmdline
 (#2161740)

- Resolves: #2161740
---
 20-zipl-kernel.install | 18 ++++++++++--------
 s390utils.spec         |  6 +++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/20-zipl-kernel.install b/20-zipl-kernel.install
index 3487aa2..a592380 100755
--- a/20-zipl-kernel.install
+++ b/20-zipl-kernel.install
@@ -76,18 +76,20 @@ 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
-                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
                 echo "Could not determine the kernel command line parameters." >&2
                 echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
diff --git a/s390utils.spec b/s390utils.spec
index 351f295..96287c9 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -10,7 +10,7 @@
 Name:           s390utils
 Summary:        Utilities and daemons for IBM z Systems
 Version:        2.25.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        MIT
 ExclusiveArch:  s390 s390x
@@ -907,6 +907,10 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* 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)
+- Resolves: #2161740
+
 * Tue Dec 13 2022 Dan Horák <dhorak@redhat.com> - 2:2.25.0-1
 - rebased to 2.25.0 (#2110310)
 - zipl: Support for Secure Boot IPL and Dump from ECKD DASD (#2044200)