Attachment 1519871 Details for Bug 1665060 – [PATCH] Make kernel-install to update default if present in zipl.conf

[patch] [PATCH] Make kernel-install to update default if present in zipl.conf

Make-kernel-install-to-update-default-if-present-in-.patch (text/plain), 4.01 KB, created by Javier Martinez Canillas on 2019-01-10 16:31:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Martinez Canillas

Created: 2019-01-10 16:31:52 UTC

Size: 4.01 KB

patch

obsolete

>From 4aaff44d867dfca046c0a1a03c3c5036ec57f89a Mon Sep 17 00:00:00 2001
>From: Javier Martinez Canillas <javierm@redhat.com>
>Date: Thu, 10 Jan 2019 17:06:29 +0100
>Subject: [PATCH] - Make kernel-install to update default if present in
> zipl.conf
>
>- Resolves: #1665060
>
>Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
>---
> 20-zipl-kernel.install | 29 ++++++++++++++++++++++++++++-
> s390utils.spec         |  6 +++++-
> 2 files changed, 33 insertions(+), 2 deletions(-)
>
>diff --git a/20-zipl-kernel.install b/20-zipl-kernel.install
>index 794d4cdf392..757364df6b3 100755
>--- a/20-zipl-kernel.install
>+++ b/20-zipl-kernel.install
>@@ -15,6 +15,7 @@ MACHINE_ID=$KERNEL_INSTALL_MACHINE_ID
> rm -rf "${BOOT_DIR_ABS%/*}"
> 
> BLS_DIR="/boot/loader/entries"
>+ZIPLCFG="/etc/zipl.conf"
> CMDLINE_LINUX_DEBUG=" systemd.log_level=debug systemd.log_target=kmsg"
> LINUX_DEBUG_VERSION_POSTFIX="_with_debugging"
> LINUX_DEBUG_TITLE_POSTFIX=" with debugging"
>@@ -105,6 +106,15 @@ case "$COMMAND" in
>                     "${BOOT_OPTIONS[*]}" >"${BLS_TARGET}"
>             fi
> 
>+            if [[ "$KERNEL_VERSION" == *\+* ]] && [ "x$DEFAULTDEBUG" != "xyes" ]; then
>+                UPDATEDEFAULT="no"
>+            fi
>+
>+            if [[ "x$UPDATEDEFAULT" = "xyes" ]]; then
>+                TITLE="$(grep '^title[ \t]' "${BLS_TARGET}" | sed -e 's/^title[ \t]*//')"
>+                NEWDEFAULT="${TITLE}"
>+            fi
>+
>             if [ "x${MAKEDEBUG}" = "xyes" ]; then
>                 BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
>                 cp -aT  "${BLS_TARGET}" "${BLS_DEBUG}"
>@@ -115,8 +125,16 @@ case "$COMMAND" in
> 		sed -i -e "s/^version.*/version ${VERSION}${LINUX_DEBUG_VERSION_POSTFIX}/" "${BLS_DEBUG}"
>                 sed -i -e "s/^id.*/${BLSID}/" "${BLS_DEBUG}"
>                 sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}${CMDLINE_LINUX_DEBUG}#" "${BLS_DEBUG}"
>+                if [ -n "$NEWDEFAULT" -a "x$DEFAULTDEBUG" = "xyes" ]; then
>+                    TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
>+                    NEWDEFAULT="${TITLE}"
>+                fi
> 	    fi
> 
>+            if [ -n "$NEWDEFAULT" ]; then
>+                sed -i -e "s,^default=.*,default=${NEWDEFAULT}," "${ZIPLCFG}"
>+            fi
>+
>             exit 0
>         fi
> 
>@@ -130,7 +148,16 @@ case "$COMMAND" in
>         if [[ ! -f /sbin/new-kernel-pkg ]]; then
>             ARCH="$(uname -m)"
>             BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
>-            BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/\.${ARCH}/-debug.${ARCH}/")"
>+            BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
>+
>+            TITLE="$(grep '^title[ \t]' "${BLS_TARGET}" | sed -e 's/^title[ \t]*//')"
>+            sed -i -e "/^default=${TITLE}/d" "${ZIPLCFG}"
>+
>+            if [[ -f "${BLS_DEBUG}" ]]; then
>+                TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
>+                sed -i -e "/^default=${TITLE}/d" "${ZIPLCFG}"
>+            fi
>+
>             rm -f "${BLS_TARGET}" "${BLS_DEBUG}"
> 
>             for i in vmlinuz System.map config zImage.stub dtb; do
>diff --git a/s390utils.spec b/s390utils.spec
>index 6b82a3bb1c0..5c1f4777630 100644
>--- a/s390utils.spec
>+++ b/s390utils.spec
>@@ -5,7 +5,7 @@ Name:           s390utils
> Summary:        Utilities and daemons for IBM z Systems
> Group:          System Environment/Base
> Version:        2.6.0
>-Release:        11%{?dist}
>+Release:        12%{?dist}
> Epoch:          2
> License:        MIT
> ExclusiveArch:  s390 s390x
>@@ -824,6 +824,10 @@ User-space development files for the s390/s390x architecture.
> 
> 
> %changelog
>+* Thu Jan 10 2019 Javier Martinez Canillas <javierm@redhat.com> - 2:2.6.0-12
>+- Make kernel-install to update default if present in zipl.conf
>+  Resolves: #1665060
>+
> * Tue Dec 11 2018 Dan HorÃ¡k <dhorak@redhat.com> - 2:2.6.0-11
> - zkey: Fails to run commands generated by 'zkey cryptsetup' (#1650628)
> - zkey: Enhance error message about missing CCA library (#1655134)
>-- 
>2.19.2
>

Actions: View | Diff

Attachments on bug 1665060: 1519773 | 1519774 | 1519871