39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From 552edb5c959bb4a99be6cba15423bf357d016aa8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dusty Mabe <dusty@dustymabe.com>
|
||
|
|
Date: Mon, 4 Mar 2019 16:42:28 -0500
|
||
|
|
Subject: [PATCH] grub: find boot partition and use it directly
|
||
|
|
|
||
|
|
On UEFI systems the grub $root might be the /boot/efi/
|
||
|
|
partition and not the /boot/ partition so let's search
|
||
|
|
for the partition with the `boot` label and then detect
|
||
|
|
the file directly.
|
||
|
|
|
||
|
|
Fixes #51
|
||
|
|
---
|
||
|
|
grub/02_ignition_firstboot | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub/02_ignition_firstboot b/grub/02_ignition_firstboot
|
||
|
|
index 9ceca5d..a154918 100755
|
||
|
|
--- a/grub/02_ignition_firstboot
|
||
|
|
+++ b/grub/02_ignition_firstboot
|
||
|
|
@@ -1,7 +1,13 @@
|
||
|
|
#!/bin/sh
|
||
|
|
exec tail -n +3 $0
|
||
|
|
+# We store the file on the /boot/ partition so find the
|
||
|
|
+# boot partition. On UEFI this may different than the grub
|
||
|
|
+# $root so we search for it here.
|
||
|
|
+# https://github.com/coreos/ignition-dracut/issues/51
|
||
|
|
+search --set=bootpart --label boot
|
||
|
|
+# Determine if this is a first boot and set the variable
|
||
|
|
+# to be used later on the kernel command line.
|
||
|
|
set ignition_firstboot=""
|
||
|
|
-# Determine if this is a first boot.
|
||
|
|
-if [ -f "/ignition.firstboot" ]; then
|
||
|
|
+if [ -f "(${bootpart})/ignition.firstboot" ]; then
|
||
|
|
set ignition_firstboot="ignition.firstboot"
|
||
|
|
fi
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|