Skip to content

Commit

Permalink
sys-kernel/bootengine: pull ignition changes
Browse files Browse the repository at this point in the history
this pulls Ignition reordering to fix Equinix Metal issues.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
  • Loading branch information
tormath1 committed Sep 11, 2024
1 parent b031f0b commit d511a60
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
From 0192e16d46defed6f0651bc14927670727034d8c Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 11 Sep 2024 15:37:37 +0200
Subject: [PATCH] ignition: umount after files Ignition stage

Equinix Metal has a network dependency at each Ignition stage, we need
network even when 'unmounting' things.
Network is shutted down in the initrd once ignition is marked as
completed so the ExecStop command was failing to be executed.

Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
dracut/30ignition/ignition-files.service | 1 +
dracut/30ignition/ignition-mount.service | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dracut/30ignition/ignition-files.service b/dracut/30ignition/ignition-files.service
index b0c11b6..c1528e3 100644
--- a/dracut/30ignition/ignition-files.service
+++ b/dracut/30ignition/ignition-files.service
@@ -33,3 +33,4 @@ EnvironmentFile=/run/ignition.env
# Flatcar: Make sure that the OEM mount point is there even if it shortly was away
ExecStartPre=-systemctl start sysroot-oem.mount
ExecStart=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=files --log-to-stdout
+ExecStartPost=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=umount --log-to-stdout
diff --git a/dracut/30ignition/ignition-mount.service b/dracut/30ignition/ignition-mount.service
index f129507..b8c68c3 100644
--- a/dracut/30ignition/ignition-mount.service
+++ b/dracut/30ignition/ignition-mount.service
@@ -38,4 +38,3 @@ EnvironmentFile=/run/ignition.env
# Flatcar: Unmount any OEM mount in case the Ignition config has one defined
ExecStartPre=/bin/bash -c 'if ! mount | grep -m 1 /sysroot/oem | grep tmpfs; then umount /sysroot/oem || true; fi'
ExecStart=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=mount --log-to-stdout
-ExecStop=/usr/bin/ignition --root=/sysroot --platform=${PLATFORM_ID} --stage=umount --log-to-stdout
--
2.44.2

0 comments on commit d511a60

Please sign in to comment.