Attachment 1734152 Details for Bug 1902273 – [PATCH] - add again the 00-zipl-prepare.install script that got dropped (#1902273)

[patch] [PATCH] - add again the 00-zipl-prepare.install script that got dropped (#1902273)

add-again-the-00-zipl-prepare.install-script-that-go.patch (text/plain), 3.65 KB, created by Javier Martinez Canillas on 2020-11-27 15:26:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Javier Martinez Canillas

Created: 2020-11-27 15:26:46 UTC

Size: 3.65 KB

patch

obsolete

>From 92f9a3dfe8ad749101dd1650528bb5d25ea03992 Mon Sep 17 00:00:00 2001
>From: Javier Martinez Canillas <javierm@redhat.com>
>Date: Fri, 27 Nov 2020 15:55:42 +0100
>Subject: [PATCH] - add again the 00-zipl-prepare.install script that got
> dropped (#1902273)
>
>The kernel-install script unconditionally creates a directory in the path
>/boot/$(cat /etc/machine-id) to store kernel and initrd images that are
>used by the BLS snippets that are created by the 90-loaderentry.install
>script. These BLS are used by systemd-boot.
>
>To prevent this to happen, as workaround a 00-zipl-prepare.install script
>was installed to remove this directory since the 90-loaderentry.install
>script checks for its existence to install their images and BLS snippets.
>
>But this script was dropped when doing the rebase to 2.15.1, which leads
>to BLS files generated that didn't contain the correct content for RHEL.
>
>Resolves: #1902273
>---
> 00-zipl-prepare.install |  9 +++++++++
> s390utils.spec          | 15 +++++++++++----
> 2 files changed, 20 insertions(+), 4 deletions(-)
> create mode 100755 00-zipl-prepare.install
>
>diff --git a/00-zipl-prepare.install b/00-zipl-prepare.install
>new file mode 100755
>index 00000000000..315b2f92c4e
>--- /dev/null
>+++ b/00-zipl-prepare.install
>@@ -0,0 +1,9 @@
>+#!/bin/bash
>+
>+COMMAND="$1"
>+KERNEL_VERSION="$2"
>+BOOT_DIR_ABS="$3"
>+KERNEL_IMAGE="$4"
>+
>+# Remove it, since for zipl the images are always installed in /boot
>+rm -rf "${BOOT_DIR_ABS%/*}"
>diff --git a/s390utils.spec b/s390utils.spec
>index 84aa2ec965e..3df80703cc2 100644
>--- a/s390utils.spec
>+++ b/s390utils.spec
>@@ -9,7 +9,7 @@
> Name:           s390utils
> Summary:        Utilities and daemons for IBM z Systems
> Version:        2.15.1
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Epoch:          2
> License:        MIT
> ExclusiveArch:  s390 s390x
>@@ -29,9 +29,10 @@ Source15:       device_cio_free.service
> Source16:       ccw_init
> Source17:       ccw.udev
> Source21:       normalize_dasd_arg
>-Source23:       20-zipl-kernel.install
>-Source24:       52-zipl-rescue.install
>-Source25:       91-zipl.install
>+Source23:       00-zipl-prepare.install
>+Source24:       20-zipl-kernel.install
>+Source25:       52-zipl-rescue.install
>+Source26:       91-zipl.install
> 
> %if 0%{?signzipl}
> %define pesign_name redhatsecureboot302
>@@ -176,6 +177,7 @@ install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ zfcpdump/10-z
> install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE23}
> install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE24}
> install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE25}
>+install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE26}
> install -d -m 0755 %{buildroot}%{_sysconfdir}/kernel/install.d/
> install -m 0644 /dev/null %{buildroot}%{_sysconfdir}/kernel/install.d/20-grubby.install
> 
>@@ -291,6 +293,7 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
> %{_udevrulesdir}/81-ccw.rules
> %{_udevrulesdir}/90-cpi.rules
> %{_sysconfdir}/kernel/install.d/20-grubby.install
>+%{_prefix}/lib/kernel/install.d/00-zipl-prepare.install
> %{_prefix}/lib/kernel/install.d/10-zfcpdump.install
> %{_prefix}/lib/kernel/install.d/20-zipl-kernel.install
> %{_prefix}/lib/kernel/install.d/52-zipl-rescue.install
>@@ -907,6 +910,10 @@ User-space development files for the s390/s390x architecture.
> 
> 
> %changelog
>+* Fri Nov 27 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.15.1-2
>+- add again the 00-zipl-prepare.install script that got dropped (#1902273)
>+  Resolves: #1902273
>+
> * Wed Nov 04 2020 Dan HorÃ¡k <dhorak@redhat.com> - 2:2.15.1-2
> - rebased to 2.15.1 (#1851111)
> - implement improved auto LUN scan (#1552697)
>-- 
>2.28.0
>

Actions: View | Diff

Attachments on bug 1902273: 1734152