Backport patch for multipath on firstboot

https://github.com/coreos/ignition/pull/1208
https://github.com/coreos/fedora-coreos-config/pull/1011
This commit is contained in:
Jonathan Lebon 2021-05-26 15:40:09 -04:00
parent 57fc8be7c9
commit 03c2a3f05b
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 88a96f132240a71112397adbb4b7ffafd570e723 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 12 May 2021 17:27:20 -0400
Subject: [PATCH] ignition-setup-user.service: drop Before=multipathd.service
We don't officially support multipath enabled on first boot yet. That's
what I'm working on, but this gets in the way because we actually need
to do the *opposite* (i.e. ensure that any I/O going to multipathed
devices is done through the multipath device node).
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1954025
---
dracut/30ignition/ignition-setup-user.service | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dracut/30ignition/ignition-setup-user.service b/dracut/30ignition/ignition-setup-user.service
index b3ad98b3..e0fb5d06 100644
--- a/dracut/30ignition/ignition-setup-user.service
+++ b/dracut/30ignition/ignition-setup-user.service
@@ -11,10 +11,6 @@ OnFailureJobMode=isolate
# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files.
Before=ignition-fetch-offline.service
-# We want to make sure we're not racing with multipath taking ownership of the
-# boot device.
-Before=multipathd.service
-
# On diskful boots, ignition-generator adds Requires/After on
# dev-disk-by\x2dlabel-boot.device
--
2.31.1

View File

@ -13,13 +13,14 @@ Version: 2.10.1
%global dracutlibdir %{_prefix}/lib/dracut %global dracutlibdir %{_prefix}/lib/dracut
Name: ignition Name: ignition
Release: 2%{?dist} Release: 3%{?dist}
Summary: First boot installer and configuration tool Summary: First boot installer and configuration tool
# Upstream license specification: Apache-2.0 # Upstream license specification: Apache-2.0
License: ASL 2.0 License: ASL 2.0
URL: %{gourl} URL: %{gourl}
Source0: %{gosource} Source0: %{gosource}
Patch0: 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch
BuildRequires: libblkid-devel BuildRequires: libblkid-devel
@ -290,6 +291,11 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
%{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe
%changelog %changelog
* Wed May 26 2021 Jonathan Lebon <jonathan@jlebon.com> - 2.10.1-3
- Backport patch for multipath on firstboot
https://github.com/coreos/ignition/pull/1208
https://github.com/coreos/fedora-coreos-config/pull/1011
* Wed May 26 2021 Jonathan Lebon <jonathan@jlebon.com> - 2.10.1-2 * Wed May 26 2021 Jonathan Lebon <jonathan@jlebon.com> - 2.10.1-2
- Redo packaging using go2rpm - Redo packaging using go2rpm