7d63e7
From c49c37d5e26bf71a97d5194d390f80d3e71758e1 Mon Sep 17 00:00:00 2001
7d63e7
From: systemd team <systemd-maint@redhat.com>
7d63e7
Date: Tue, 23 Apr 2019 10:46:19 -0300
7d63e7
Subject: [PATCH] Update kernel-install script by backporting fedora patches
7d63e7
7d63e7
---
7d63e7
 src/kernel-install/kernel-install | 30 +++++++++++++++++-------------
7d63e7
 1 file changed, 17 insertions(+), 13 deletions(-)
7d63e7
7d63e7
diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install
7d63e7
index f1c74de..d860701 100755
7d63e7
--- a/src/kernel-install/kernel-install
7d63e7
+++ b/src/kernel-install/kernel-install
7d63e7
@@ -73,23 +73,27 @@ KERNEL_IMAGE="$2"
7d63e7
 
7d63e7
 if [[ -x /sbin/new-kernel-pkg ]]; then
7d63e7
     KERNEL_DIR="${KERNEL_IMAGE%/*}"
7d63e7
-    if [[ "${KERNEL_DIR}" != "/boot" ]]; then
7d63e7
-        for i in \
7d63e7
-            "$KERNEL_IMAGE" \
7d63e7
-            "$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac" \
7d63e7
-            "$KERNEL_DIR"/System.map \
7d63e7
-            "$KERNEL_DIR"/config \
7d63e7
-            "$KERNEL_DIR"/zImage.stub \
7d63e7
-            "$KERNEL_DIR"/dtb \
7d63e7
-            ; do
7d63e7
-            [[ -e "$i" ]] || continue
7d63e7
-            cp -a "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
7d63e7
-        done
7d63e7
-    fi
7d63e7
 
7d63e7
     [[ "$KERNEL_VERSION" == *\+* ]] && flavor=-"${KERNEL_VERSION##*+}"
7d63e7
     case "$COMMAND" in
7d63e7
         add)
7d63e7
+            if [[ "${KERNEL_DIR}" != "/boot" ]]; then
7d63e7
+                for i in \
7d63e7
+                    "$KERNEL_IMAGE" \
7d63e7
+                    "$KERNEL_DIR"/System.map \
7d63e7
+                    "$KERNEL_DIR"/config \
7d63e7
+                    "$KERNEL_DIR"/zImage.stub \
7d63e7
+                    "$KERNEL_DIR"/dtb \
7d63e7
+                    ; do
7d63e7
+                    [[ -e "$i" ]] || continue
7d63e7
+                    cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
7d63e7
+                done
7d63e7
+                # hmac is .vmlinuz-<version>.hmac so needs a special treatment
7d63e7
+                i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
7d63e7
+                if [[ -e "$i" ]]; then
7d63e7
+                    cp -aT "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
7d63e7
+                fi
7d63e7
+            fi
7d63e7
             /sbin/new-kernel-pkg --package "kernel${flavor}" --install "$KERNEL_VERSION" || exit $?
7d63e7
             /sbin/new-kernel-pkg --package "kernel${flavor}" --mkinitrd --dracut --depmod --update "$KERNEL_VERSION" || exit $?
7d63e7
             /sbin/new-kernel-pkg --package "kernel${flavor}" --rpmposttrans "$KERNEL_VERSION" || exit $?
7d63e7
-- 
7d63e7
1.8.3.1
7d63e7