From c67462bad16d56160a713790dcadddb27dea79ac Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 25 Jun 2021 22:31:12 -0400 Subject: [PATCH] 2.11.0 --- .gitignore | 1 + ...ser.service-drop-Before-multipathd.s.patch | 33 -------------- ignition.spec | 44 ++++++++++--------- sources | 2 +- 4 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch diff --git a/.gitignore b/.gitignore index 5d442e6..42f06a3 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /ignition-1d56dc8.tar.gz /ignition-2.9.0.tar.gz /ignition-2.10.1.tar.gz +/ignition-2.11.0.tar.gz diff --git a/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch b/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch deleted file mode 100644 index ba43245..0000000 --- a/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 88a96f132240a71112397adbb4b7ffafd570e723 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -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 - diff --git a/ignition.spec b/ignition.spec index 57755ef..5c8cbb4 100644 --- a/ignition.spec +++ b/ignition.spec @@ -4,7 +4,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.10.1 +Version: 2.11.0 %gometa @@ -13,14 +13,13 @@ Version: 2.10.1 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Patch0: 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch BuildRequires: libblkid-devel @@ -109,28 +108,12 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-201707 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 -Provides: bundled(golang(go.opencensus.io)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 Provides: bundled(golang(golang.org/x/net/context)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/trace)) = 0.0.0-20200602114024.git627f9648deb9 @@ -182,6 +165,22 @@ Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0- Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(go.opencensus.io)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 %description Ignition is a utility used to manipulate systems during the initramfs. @@ -291,6 +290,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* Fri Jun 25 2021 Benjamin Gilbert - 2.11.0-1 +- New release + * Wed May 26 2021 Jonathan Lebon - 2.10.1-3 - Backport patch for multipath on firstboot https://github.com/coreos/ignition/pull/1208 diff --git a/sources b/sources index 21c6ff9..1ac0d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.10.1.tar.gz) = 039ea5ab19c0e2efa6ec2c21534e4a5b93f0fb20576d51563283ede1caa3faa29dbb461632bb01f7549d47677991d17516d94f2cefc5982d23545ace5f196f4f +SHA512 (ignition-2.11.0.tar.gz) = e84d8e9f8991f3737b7a8c5d6e47a9312eae807966a47eee4a53ef0ec8a543bbb8a71a0d2a64869eea6df943b5d3bb79c74f8571a9406d7c40b82e6a50779985