sys-apps/ignition: apply Flatcar modifications

tormath1 · tormath1 · commit af0252a0bc39 · 2025-08-13T15:45:47.000+02:00
Signed-off-by: Mathieu Tortuyaux &lt;mtortuyaux@microsoft.com&gt;
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch
@@ -1,4 +1,4 @@
-From 42358eaa661444c3d5d07c4b52f8879372adaacf Mon Sep 17 00:00:00 2001
+From 90e5d7f0ebd155460cbdeae02805ba5bbb953799 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Mon, 26 Sep 2022 12:12:04 +0200
 Subject: [PATCH 02/20] config: add ignition translation
@@ -2621,5 +2621,5 @@ index 00000000..e81f6bed
 +	}
 +}
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch
@@ -1,47 +1,70 @@
-From 99d75703026de8787b4bb83e77bd07d1f6d730b9 Mon Sep 17 00:00:00 2001
+From 6aadc7bde6dd35606aae3b7e5c1bbdf41467f9b2 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Wed, 26 Mar 2025 15:10:08 +0100
+Date: Tue, 12 Aug 2025 15:10:05 +0200
 Subject: [PATCH 03/20] mod: add flatcar/ignition@0.36.2
 
 it's required for Ignition conversion.
 
 Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 ---
+ build  | 4 ++--
  go.mod | 4 ++++
- 1 file changed, 4 insertions(+)
+ 2 files changed, 6 insertions(+), 2 deletions(-)
 
+diff --git a/build b/build
+index 9bf93d61..5abdcf5f 100755
+--- a/build
++++ b/build
+@@ -5,7 +5,7 @@ set -eu
+ export GO111MODULE=on
+ 
+ NAME="ignition"
+-ORG_PATH="github.com/coreos"
++ORG_PATH="github.com/flatcar"
+ REPO_PATH="${ORG_PATH}/${NAME}/v2"
+ GLDFLAGS=${GLDFLAGS:-}
+ export GOFLAGS=-mod=vendor
+@@ -15,7 +15,7 @@ if [ -z ${VERSION+a} ]; then
+ 	echo "Using version from git: $VERSION"
+ fi
+ 
+-GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}"
++GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/version.Raw=${VERSION}"
+ 
+ eval $(go env)
+ 
 diff --git a/go.mod b/go.mod
-index f94bbafa..2afaf4ae 100644
+index a34e8f5e..be20c337 100644
 --- a/go.mod
 +++ b/go.mod
-@@ -14,6 +14,7 @@ require (
+@@ -15,6 +15,7 @@ require (
  	github.com/coreos/go-semver v0.3.1
  	github.com/coreos/go-systemd/v22 v22.5.0
  	github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687
 +	github.com/flatcar/ignition v0.36.2
  	github.com/google/renameio/v2 v2.0.0
  	github.com/google/uuid v1.6.0
  	github.com/mdlayher/vsock v1.2.1
-@@ -43,9 +44,11 @@ require (
- 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
- 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
- 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
+@@ -44,9 +45,11 @@ require (
+ 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
+ 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
+ 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
 +	github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
  	github.com/cespare/xxhash/v2 v2.3.0 // indirect
- 	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
+ 	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
  	github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
 +	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
  	github.com/davecgh/go-spew v1.1.1 // indirect
  	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
  	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
-@@ -75,6 +78,7 @@ require (
- 	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
- 	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
- 	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+@@ -77,6 +80,7 @@ require (
+ 	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
+ 	go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
+ 	go.opentelemetry.io/otel/trace v1.36.0 // indirect
 +	go4.org v0.0.0-20160314031811-03efcb870d84 // indirect
- 	golang.org/x/crypto v0.36.0 // indirect
- 	golang.org/x/sync v0.12.0 // indirect
- 	golang.org/x/text v0.23.0 // indirect
+ 	golang.org/x/crypto v0.39.0 // indirect
+ 	golang.org/x/sync v0.15.0 // indirect
+ 	golang.org/x/text v0.26.0 // indirect
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch
@@ -1,6 +1,6 @@
-From e36800fa55585c4db32a60b6c8c74bb0b3e4b17e Mon Sep 17 00:00:00 2001
+From 1f9914e7a140622f5d37a2621f05576fe9bdd6a6 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Wed, 26 Mar 2025 15:11:11 +0100
+Date: Tue, 12 Aug 2025 15:10:57 +0200
 Subject: [PATCH 05/20] vendor: go mod vendor
 
 Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
@@ -17029,20 +17029,20 @@ index 00000000..1b1efb0f
 +	return
 +}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 888d509e..984b721c 100644
+index 1e5cbab2..3d3bae00 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
-@@ -128,6 +128,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
- # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1
- ## explicit; go 1.21
+@@ -129,6 +129,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric
+ # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0
+ ## explicit; go 1.22
  github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping
 +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437
 +## explicit
 +github.com/ajeddeloh/go-json
- # github.com/aws/aws-sdk-go v1.55.6
+ # github.com/aws/aws-sdk-go v1.55.7
  ## explicit; go 1.19
  github.com/aws/aws-sdk-go/aws
-@@ -208,6 +211,9 @@ github.com/coreos/go-json
+@@ -209,6 +212,9 @@ github.com/coreos/go-json
  # github.com/coreos/go-semver v0.3.1
  ## explicit; go 1.8
  github.com/coreos/go-semver/semver
@@ -17052,7 +17052,7 @@ index 888d509e..984b721c 100644
  # github.com/coreos/go-systemd/v22 v22.5.0
  ## explicit; go 1.12
  github.com/coreos/go-systemd/v22/dbus
-@@ -269,6 +275,27 @@ github.com/envoyproxy/protoc-gen-validate/validate
+@@ -270,6 +276,27 @@ github.com/envoyproxy/protoc-gen-validate/validate
  # github.com/felixge/httpsnoop v1.0.4
  ## explicit; go 1.13
  github.com/felixge/httpsnoop
@@ -17077,19 +17077,19 @@ index 888d509e..984b721c 100644
 +github.com/flatcar/ignition/config/validate/astjson
 +github.com/flatcar/ignition/config/validate/astnode
 +github.com/flatcar/ignition/config/validate/report
- # github.com/go-logr/logr v1.4.2
- ## explicit; go 1.18
- github.com/go-logr/logr
-@@ -447,6 +474,9 @@ go.opentelemetry.io/otel/sdk/metric/metricdata
- go.opentelemetry.io/otel/trace
+ # github.com/go-jose/go-jose/v4 v4.0.5
+ ## explicit; go 1.21
+ github.com/go-jose/go-jose/v4
+@@ -456,6 +483,9 @@ go.opentelemetry.io/otel/trace
  go.opentelemetry.io/otel/trace/embedded
+ go.opentelemetry.io/otel/trace/internal/telemetry
  go.opentelemetry.io/otel/trace/noop
 +# go4.org v0.0.0-20160314031811-03efcb870d84
 +## explicit
 +go4.org/errorutil
- # golang.org/x/crypto v0.36.0
+ # golang.org/x/crypto v0.39.0
  ## explicit; go 1.23.0
  golang.org/x/crypto/chacha20
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_6-convert-ignition-2.x-to-3.x.patch
@@ -1,4 +1,4 @@
-From 0217fb3e21f9acff70ccaff3c0c6fa8a105df1d0 Mon Sep 17 00:00:00 2001
+From dd049ec1e89e66b77ba42e577d16dce26b1934be Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Thu, 24 Oct 2024 10:20:45 +0200
 Subject: [PATCH 06/20] config/v3_6: convert ignition 2.x to 3.x
@@ -72,5 +72,5 @@ index 3be26cae..ea367663 100644
  		return Parse(raw)
  	}
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch
@@ -1,4 +1,4 @@
-From f82805de0aa6defb2f641facfb2fabf07cc1953a Mon Sep 17 00:00:00 2001
+From 9b65ff780e20f49a89bd65a5c06aca4ecff759c3 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Mon, 19 Feb 2024 18:12:22 +0100
 Subject: [PATCH 07/20] internal/prv/cmdline: backport flatcar patch
@@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644
  		}
  
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch
@@ -1,4 +1,4 @@
-From bcc67f65dbcbe6d66d0fb8c96c1ee183585da6f9 Mon Sep 17 00:00:00 2001
+From fa74f6d768ebdb659cea900b775adbf1bd8777a1 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Tue, 20 Feb 2024 10:02:28 +0100
 Subject: [PATCH 08/20] provider/qemu: apply fw_cfg patch
@@ -159,5 +159,5 @@ index 389ec119..cab9c476 100644
 +
  }
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_6-test-add-ignition-2.x-test-cases.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_6-test-add-ignition-2.x-test-cases.patch
@@ -1,4 +1,4 @@
-From c2c5e782e3e7d7c2a8699597059bac2614e698ed Mon Sep 17 00:00:00 2001
+From cfbafbad17967ee3078268e6333d85eb63e878de Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mathieu@kinvolk.io>
 Date: Thu, 2 Sep 2021 11:03:17 +0200
 Subject: [PATCH 09/20] config/3_6/test: add ignition 2.x test cases
@@ -40,5 +40,5 @@ index 54cbd91c..99f2e3dd 100644
  			in:  in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
  			out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch
@@ -1,4 +1,4 @@
-From 459ff2f9890250ae027aa50b96dac125f8ae8a65 Mon Sep 17 00:00:00 2001
+From b1ef36e1cc50d999e42d277784951958d8d27c15 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 22 Sep 2021 14:53:49 +0200
 Subject: [PATCH 10/20] internal/disk/fs: ignore fs format mismatches for the
@@ -35,5 +35,5 @@ index c575ced4..fefd1fff 100644
  			(fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) {
  			s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device)
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch
@@ -1,4 +1,4 @@
-From 67c775d6c1c7706ba1437c827e60c8f38544c1f8 Mon Sep 17 00:00:00 2001
+From 5345acc03a69732cf975539f61f5014021b10249 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Tue, 20 Feb 2024 10:12:02 +0100
 Subject: [PATCH 11/20] VMware: Fix guestinfo.*.config.data and *.config.url
@@ -164,5 +164,5 @@ index 597c33fd..3680a4cd 100644
  
  func delConfig(f *resource.Fetcher) error {
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch
@@ -1,4 +1,4 @@
-From 2a7d30599956087db90b260dcb75fbc0762d95da Mon Sep 17 00:00:00 2001
+From 623e54e841421fb162e2c6460f70e4f00f6ba6de Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 2 Feb 2022 13:27:18 +0100
 Subject: [PATCH 12/20] config/version: handle configuration version 1
@@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644
  		return semver.Version{}, report.Report{}, errors.ErrInvalidVersion
  	}
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch
@@ -1,4 +1,4 @@
-From fe115de47cff4745b46c0c045a51c3a66150c5f9 Mon Sep 17 00:00:00 2001
+From 3a8f30f83985479c14a731f633674ec4760167f8 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Tue, 22 Feb 2022 15:41:13 +0100
 Subject: [PATCH 13/20] config/util: add cloud init detection to initial
@@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644
  	if err == nil {
  		return report.Report{}, nil
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch
@@ -1,4 +1,4 @@
-From 67b8b674471fc8bf16a9e65692b2cf13637f60d0 Mon Sep 17 00:00:00 2001
+From e54c4e06dba4becc526828260ecc6cff70308b92 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 25 May 2022 10:38:16 +0200
 Subject: [PATCH 14/20] Revert "*: drop OEM URI support"
@@ -81,7 +81,7 @@ index 9b2b4405..5258c3c6 100644
  	case "s3":
  		if v, ok := u.Query()["versionId"]; ok {
 diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
-index d2434e2e..9e80ed2a 100644
+index 5f508761..b81beee0 100644
 --- a/docs/supported-platforms.md
 +++ b/docs/supported-platforms.md
 @@ -12,6 +12,7 @@ Ignition is currently supported for the following platforms:
@@ -271,5 +271,5 @@ index 354385fa..f7b855d8 100644
 +	)
 +}
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch
@@ -1,4 +1,4 @@
-From 0ab0dca4211dc835bb9b7f4402f9e3c6ccb1dc46 Mon Sep 17 00:00:00 2001
+From 16b836b53d366d9817c83ab78ca42d1ecbbaf013 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kai=20L=C3=BCke?= <kailuke@microsoft.com>
 Date: Wed, 7 Jul 2021 18:40:52 +0200
 Subject: [PATCH 15/20] internal/resource/url: support btrfs as OEM partition
@@ -35,5 +35,5 @@ index f7b855d8..e66707fd 100644
  
  	return nil
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch
@@ -1,4 +1,4 @@
-From 5cf4125e598ce7f0ab02b4b8fb1ed3a810f05294 Mon Sep 17 00:00:00 2001
+From 61a961a5ef0fb33a6b88de89fe3b7f206b04b3c8 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Thu, 10 Nov 2022 11:58:49 +0100
 Subject: [PATCH 16/20] translation: support OEM and oem
@@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644
 +	}
 +}
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch
@@ -1,4 +1,4 @@
-From 7ae88250e01d677abdc4a4755fd66984a6328c81 Mon Sep 17 00:00:00 2001
+From 0b020d695986a470c62fc0d22d5a769d383492bd Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Tue, 20 Feb 2024 10:25:24 +0100
 Subject: [PATCH 17/20] revert: internal/oem: drop noop OEMs
@@ -42,5 +42,5 @@ index 27c923d4..ae259f8f 100644
  
  func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch
@@ -1,4 +1,4 @@
-From d88e7af1759737d4b21adf38655312976587aeb6 Mon Sep 17 00:00:00 2001
+From 482f539aeaeef6c8a3fd4cbc026dd1728bab4f2c Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Mon, 4 Mar 2024 15:05:14 +0100
 Subject: [PATCH 18/20] docs: Add re-added platforms to docs to pass tests
@@ -10,7 +10,7 @@ Co-Authored-By: Krzesimir Nowak <knowak@microsoft.com
  1 file changed, 4 insertions(+)
 
 diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
-index 9e80ed2a..7e2ac5a0 100644
+index b81beee0..75cf5501 100644
 --- a/docs/supported-platforms.md
 +++ b/docs/supported-platforms.md
 @@ -15,6 +15,7 @@ Ignition is currently supported for the following platforms:
@@ -21,7 +21,7 @@ index 9e80ed2a..7e2ac5a0 100644
  * [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately.
  * [Exoscale] (`exoscale`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [Google Cloud] (`gcp`) - Ignition will read its configuration from the instance metadata entry named "user-data". Cloud SSH keys are handled separately.
-@@ -29,6 +30,9 @@ Ignition is currently supported for the following platforms:
+@@ -30,6 +31,9 @@ Ignition is currently supported for the following platforms:
  * [Equinix Metal] (`packet`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [IBM Power Systems Virtual Server] (`powervs`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [QEMU] (`qemu`) - Ignition will read its configuration from the 'opt/com.coreos/config' key on the QEMU Firmware Configuration Device (available in QEMU 2.4.0 and higher).
@@ -32,5 +32,5 @@ index 9e80ed2a..7e2ac5a0 100644
  * [VirtualBox] (`virtualbox`) - Use the VirtualBox guest property `/Ignition/Config` to provide the config to the virtual machine.
  * [VMware] (`vmware`) - Use the VMware Guestinfo variables `ignition.config.data` and `ignition.config.data.encoding` to provide the config and its encoding to the virtual machine. Valid encodings are "", "base64", and "gzip+base64". Guestinfo variables can be provided directly or via an OVF environment, with priority given to variables specified directly.
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch
@@ -1,4 +1,4 @@
-From 65cb148ff154d54ed37176cfa08bfc65874236f6 Mon Sep 17 00:00:00 2001
+From 82b3c7842f9872851a6a31b58c4da45f8924f549 Mon Sep 17 00:00:00 2001
 From: Krzesimir Nowak <knowak@microsoft.com>
 Date: Tue, 4 Apr 2023 12:12:42 +0200
 Subject: [PATCH 19/20] /usr/share/oem -> /oem
@@ -38,5 +38,5 @@ index 2726d705..c335eeee 100644
  
  	// Helper programs
 -- 
-2.45.3
+2.49.1
 
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch
@@ -1,4 +1,4 @@
-From bcb802948375640e30beaca9eac1069426a63a8b Mon Sep 17 00:00:00 2001
+From c305808b5b11bbf77c0ade3d7c2a4d32311616d4 Mon Sep 17 00:00:00 2001
 From: Krzesimir Nowak <knowak@microsoft.com>
 Date: Tue, 16 May 2023 17:43:43 +0200
 Subject: [PATCH 20/20] internal/exec/stages/mount: Mount /oem
@@ -28,5 +28,5 @@ index bace4bbd..bc6767d2 100644
  	if err := checkForNonDirectories(path); err != nil {
  		return err
 -- 
-2.45.3
+2.49.1
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From bcc67f65dbcbe6d66d0fb8c96c1ee183585da6f9 Mon Sep 17 00:00:00 2001`
	`1`	`+From fa74f6d768ebdb659cea900b775adbf1bd8777a1 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Mathieu Tortuyaux <[email protected]>`
`3`	`3`	`Date: Tue, 20 Feb 2024 10:02:28 +0100`
`4`	`4`	`Subject: [PATCH 08/20] provider/qemu: apply fw_cfg patch`
`@@ -159,5 +159,5 @@ index 389ec119..cab9c476 100644`
`159`	`159`	`+`
`160`	`160`	`}`
`161`	`161`	`--`
`162`		`-2.45.3`
	`162`	`+2.49.1`
`163`	`163`