From e9482b3e090c8a447dc397c09cf2c2934ccb97b2 Mon Sep 17 00:00:00 2001
From: Pablo Greco <pablo@fliagreco.com.ar>
Date: Apr 23 2019 14:29:39 +0000
Subject: Update kernel-install script for fedora-like kernels


---

diff --git a/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
new file mode 100644
index 0000000..c42f0b6
--- /dev/null
+++ b/SOURCES/9999-Update-kernel-install-script-by-backporting-fedora-p.patch
@@ -0,0 +1,57 @@
+From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001
+From: systemd team <systemd-maint@redhat.com>
+Date: Tue, 23 Apr 2019 10:46:19 -0300
+Subject: [PATCH] Update kernel-install script by backporting fedora patches
+
+---
+ src/kernel-install/kernel-install | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
+index f1c74de..d860701 100755
+--- a/src/kernel-install/kernel-install
++++ b/src/kernel-install/kernel-install
+@@ -73,23 +73,27 @@ KERNEL_IMAGE="$2"
+ 
+ if [[ -x /sbin/new-kernel-pkg ]]; then
+     KERNEL_DIR="${KERNEL_IMAGE%/*}"
+-    if [[ "${KERNEL_DIR}" != "/boot" ]]; then
+-        for i in \
+-            "$KERNEL_IMAGE" \
+-            "$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" \
+-            "$KERNEL_DIR"/System.map \
+-            "$KERNEL_DIR"/config \
+-            "$KERNEL_DIR"/zImage.stub \
+-            "$KERNEL_DIR"/dtb \
+-            ; do
+-            [[ -e "$i" ]] || continue
+-            cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
+-        done
+-    fi
+ 
+     [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
+     case "$COMMAND" in
+         add)
++            if [[ "${KERNEL_DIR}" != "/boot" ]]; then
++                for i in \
++                    "$KERNEL_IMAGE" \
++                    "$KERNEL_DIR"/System.map \
++                    "$KERNEL_DIR"/config \
++                    "$KERNEL_DIR"/zImage.stub \
++                    "$KERNEL_DIR"/dtb \
++                    ; do
++                    [[ -e "$i" ]] || continue
++                    cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
++                done
++                # hmac is .vmlinuz-<version>.hmac so needs a special treatment
++                i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
++                if [[ -e "$i" ]]; then
++                    cp -aT "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
++                fi
++            fi
+             /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
+             /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
+             /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
+-- 
+1.8.3.1
+
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 1746f92..e227f30 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -7,7 +7,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        219
-Release:        62%{?dist}.6
+Release:        62%{?dist}.6.0.1
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -713,6 +713,8 @@ Patch0671: 0671-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
 Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
 Patch0673: 0673-Revert-bus-when-dumping-string-property-values-escap.patch
 
+Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch
+
 %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
 
 BuildRequires:  libcap-devel
@@ -1688,6 +1690,9 @@ fi
 %{_mandir}/man8/systemd-resolved.*
 
 %changelog
+* Tue Apr 23 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.6.0.1
+- Update kernel-install script for fedora-like kernels
+
 * Thu Mar 21 2019 Lukas Nykryn <lnykryn@redhat.com> - 219-62.6
 - Revert "bus: when dumping string property values escape the chars we use as end-of-line and end-of-item marks" (#1643172)