40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 43634c2469a33c80c235f9bfe254002c6bea5448 Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@hoyer.xyz>
|
|
Date: Mon, 18 Dec 2017 15:26:31 +0100
|
|
Subject: [PATCH] Merge pull request #335 from lnykryn/BOOT_IMAGE-to-HMAC
|
|
|
|
01fips: Fix creating path to .hmac of kernel based on BOOT_IMAGE
|
|
---
|
|
modules.d/01fips/fips.sh | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
|
|
index 1e5707c0..11de1793 100755
|
|
--- a/modules.d/01fips/fips.sh
|
|
+++ b/modules.d/01fips/fips.sh
|
|
@@ -110,13 +110,19 @@ do_fips()
|
|
do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
|
|
else
|
|
BOOT_IMAGE="$(getarg BOOT_IMAGE)"
|
|
- [ -e "/boot/.${BOOT_IMAGE}.hmac" ] || BOOT_IMAGE="vmlinuz-${KERNEL}"
|
|
+ if ! [ -e "/boot/${BOOT_IMAGE}" ]; then
|
|
+ #if /boot is not a separate partition BOOT_IMAGE might start with /boot
|
|
+ BOOT_IMAGE=${BOOT_IMAGE#"/boot"}
|
|
+ [ -e "/boot/${BOOT_IMAGE}" ] || BOOT_IMAGE="vmlinuz-${KERNEL}"
|
|
+ fi
|
|
+
|
|
+ BOOT_IMAGE_HMAC="/boot/${BOOT_IMAGE%/*}/.${BOOT_IMAGE##*/}.hmac"
|
|
|
|
- if ! [ -e "/boot/.${BOOT_IMAGE}.hmac" ]; then
|
|
- warn "/boot/.${BOOT_IMAGE}.hmac does not exist"
|
|
+ if ! [ -e "${BOOT_IMAGE_HMAC}" ]; then
|
|
+ warn "${BOOT_IMAGE_HMAC} does not exist"
|
|
return 1
|
|
fi
|
|
- sha512hmac -c "/boot/.${BOOT_IMAGE}.hmac" || return 1
|
|
+ sha512hmac -c "${BOOT_IMAGE_HMAC}" || return 1
|
|
fi
|
|
|
|
info "All initrd crypto checks done"
|
|
|