|
 |
fab351 |
From 9e8f172dc01f7e013bb5d302ef6c90e2dc6b30c8 Mon Sep 17 00:00:00 2001
|
|
|
fab351 |
From: Jonathan Lebon <jonathan@jlebon.com>
|
|
|
fab351 |
Date: Tue, 29 Oct 2019 16:54:10 -0400
|
|
|
fab351 |
Subject: [PATCH] 01fips: trim off GRUB boot device from BOOT_IMAGE
|
|
|
fab351 |
|
|
|
fab351 |
E.g. in RHCOS, the `BOOT_IMAGE` from the cmdline is:
|
|
|
fab351 |
|
|
|
fab351 |
(hd0,gpt1)/ostree/rhcos-e493371e5ee8407889029ec979955a2b86fd7e3cae5a0591b9db1cd248d966e8/vmlinuz-4.18.0-146.el8.x86_64
|
|
|
fab351 |
|
|
|
fab351 |
Which of course is a GRUB thing, not an actual pathname we'll be able to
|
|
|
fab351 |
resolve. In fact, we can simply scrap it off from the variable. Our code
|
|
|
fab351 |
is already able to handle both cases: whether the device refers to a
|
|
|
fab351 |
separate boot partition, or just the root filesystem with a regular
|
|
|
fab351 |
`/boot` directory.
|
|
|
fab351 |
---
|
|
|
fab351 |
modules.d/01fips/fips.sh | 4 ++++
|
|
|
fab351 |
1 file changed, 4 insertions(+)
|
|
|
fab351 |
|
|
|
fab351 |
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
|
|
|
fab351 |
index de2755b0..559952ca 100755
|
|
|
fab351 |
--- a/modules.d/01fips/fips.sh
|
|
|
fab351 |
+++ b/modules.d/01fips/fips.sh
|
|
|
fab351 |
@@ -113,6 +113,10 @@ do_fips()
|
|
|
fab351 |
do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1
|
|
|
fab351 |
else
|
|
|
fab351 |
BOOT_IMAGE="$(getarg BOOT_IMAGE)"
|
|
|
fab351 |
+
|
|
|
fab351 |
+ # Trim off any leading GRUB boot device (e.g. ($root) )
|
|
|
fab351 |
+ BOOT_IMAGE="$(echo "${BOOT_IMAGE}" | sed 's/^(.*)//')"
|
|
|
fab351 |
+
|
|
|
fab351 |
BOOT_IMAGE_NAME="${BOOT_IMAGE##*/}"
|
|
|
fab351 |
BOOT_IMAGE_PATH="${BOOT_IMAGE%${BOOT_IMAGE_NAME}}"
|
|
|
fab351 |
|
|
|
fab351 |
|