sys-apps/ignition: regen ignition-translation patch

we were generating a '/usr/share/oem' mapping for 'oem' filesystems. That only affects the Ignition run. Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar-archive · Mar 6, 2023 · 8f2fadb · 8f2fadb
1 parent 8bef55e
commit 8f2fadb
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 24 deletions.
diff --git a/sys-apps/ignition/files/0005-config-add-ignition-translation.patch b/sys-apps/ignition/files/0005-config-add-ignition-translation.patch
@@ -1,4 +1,4 @@
-From 54fa31c31ed431678adc89b6dfa450022d2f96fa Mon Sep 17 00:00:00 2001
+From 9596af9b8a3d1f999a8252a8a1a17f0bf6040f14 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Mon, 26 Sep 2022 12:12:04 +0200
 Subject: [PATCH 05/18] config: add ignition translation
@@ -7,20 +7,20 @@ it's a merge from flatcar/ign-converter
 
 Signed-off-by: Mathieu Tortuyaux <[email protected]>
 ---
- config/util/translate.go         |  166 +++
+ config/util/translate.go         |  162 +++
  config/v24tov31/v24tov31.go      |  729 +++++++++++++
  config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++
- 3 files changed, 2587 insertions(+)
+ 3 files changed, 2583 insertions(+)
  create mode 100644 config/util/translate.go
  create mode 100644 config/v24tov31/v24tov31.go
  create mode 100644 config/v24tov31/v24tov31_test.go
 
 diff --git a/config/util/translate.go b/config/util/translate.go
 new file mode 100644
-index 00000000..347d148c
+index 00000000..8987df53
 --- /dev/null
 +++ b/config/util/translate.go
-@@ -0,0 +1,166 @@
+@@ -0,0 +1,162 @@
 +// Copyright 2020 Red Hat, Inc.
 +//
 +// Licensed under the Apache License, Version 2.0 (the "License");
@@ -176,12 +176,8 @@ index 00000000..347d148c
 +
 +	if _, ok := fsMap[name]; !ok {
 +		addedSuffixCounter += 1
-+		if name == "oem" {
-+			fsMap[name] = "/usr/share/oem"
-+		} else {
-+			// generate a new path
-+			fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10)
-+		}
++		// generate a new path
++		fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10)
 +	}
 +
 +	counterMutex.Unlock()

diff --git a/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch b/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch
@@ -1,4 +1,4 @@
-From b33b28b0c5373c40b3cd9480be5519fe579612cf Mon Sep 17 00:00:00 2001
+From d0fd9cf5a3d3772c352ce2246d9d6b73c98b2e57 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 25 May 2022 10:20:09 +0200
 Subject: [PATCH 06/18] config/v3_5: convert ignition 2.x to 3.x

diff --git a/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch b/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch
@@ -1,4 +1,4 @@
-From b2f30b420740fc48611fe28d39c1e87a7efe9dc9 Mon Sep 17 00:00:00 2001
+From d9b85761f3baf1bf0aa7415c2a2865afe5f3a686 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Fri, 30 Jul 2021 14:21:31 +0200
 Subject: [PATCH 07/18] internal/prv/cmdline: backport flatcar patch

diff --git a/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch b/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch
@@ -1,4 +1,4 @@
-From 3f6a1a26812dc29fbb97ced24959a991bcc85a83 Mon Sep 17 00:00:00 2001
+From 04c0cf7f4f9742a363adc05c787f7d84271e8923 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Fri, 24 Feb 2023 09:40:01 +0100
 Subject: [PATCH 08/18] provider/qemu: apply fw_cfg patch

diff --git a/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch b/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch
@@ -1,4 +1,4 @@
-From 240e3e2b8ba5a19cdef6f6cd9856435337283510 Mon Sep 17 00:00:00 2001
+From 2e7b4fb38dcdfeae0f58d03e3a6a1baff5111d6c Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Thu, 2 Sep 2021 11:03:17 +0200
 Subject: [PATCH 09/18] config/3_5/test: add ignition 2.x test cases

diff --git a/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch
@@ -1,4 +1,4 @@
-From 14818bec1b1abf628cfbc5885063561019679044 Mon Sep 17 00:00:00 2001
+From 9b344277c62cd90e8336b1cd3f08e4b6d29e1ba2 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 22 Sep 2021 14:53:49 +0200
 Subject: [PATCH 10/18] internal/disk/fs: ignore fs format mismatches for the

diff --git a/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch
@@ -1,4 +1,4 @@
-From ee9b77b552d65f8620abee384beb60dd3ffeb93d Mon Sep 17 00:00:00 2001
+From 5b5b380e2f2147ce33c1b2a99a122fc4694ef666 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 25 May 2022 10:34:32 +0200
 Subject: [PATCH 11/18] VMware: Fix guestinfo.*.config.data and *.config.url

diff --git a/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch b/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch
@@ -1,4 +1,4 @@
-From e5331453b47bd657e6a727f23548283756c326d5 Mon Sep 17 00:00:00 2001
+From 651fda1dbfc8de62cf56d8d6a3e9c5eba2ad0d53 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 2 Feb 2022 13:27:18 +0100
 Subject: [PATCH 12/18] config/version: handle configuration version 1

diff --git a/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch b/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch
@@ -1,4 +1,4 @@
-From 105a9165b37c962153a4b671bea8025122e81a72 Mon Sep 17 00:00:00 2001
+From 40f7fc696db0c0f1e484f1c735673a2432ac4f82 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Tue, 22 Feb 2022 15:41:13 +0100
 Subject: [PATCH 13/18] config/util: add cloud init detection to initial

diff --git a/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch b/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch
@@ -1,4 +1,4 @@
-From ccaf67b639741cd3716c556aad70e5bf32272979 Mon Sep 17 00:00:00 2001
+From 8ea10deef15aa841430bfcb76b47c7809a00febe Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 25 May 2022 10:38:16 +0200
 Subject: [PATCH 14/18] Revert "*: drop OEM URI support"

diff --git a/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch
@@ -1,4 +1,4 @@
-From c3308bc57e06947c02100e7befe61bfbdb10052b Mon Sep 17 00:00:00 2001
+From 1636b94d0f7b39a2ff4a0de98365e32402738ff8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kai=20L=C3=BCke?= <[email protected]>
 Date: Wed, 7 Jul 2021 18:40:52 +0200
 Subject: [PATCH 15/18] internal/resource/url: support btrfs as OEM partition

diff --git a/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch b/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch
@@ -1,4 +1,4 @@
-From e7cfcc2d44f83d2bc7a481c62a09b7d8c7aee2f4 Mon Sep 17 00:00:00 2001
+From 91546eaa197589a2b16ab46c4d82fc945cba8a4e Mon Sep 17 00:00:00 2001
 From: Kai Lueke <[email protected]>
 Date: Fri, 11 Feb 2022 15:41:12 +0100
 Subject: [PATCH 16/18] internal/exec/stages/disks: prevent races with udev

diff --git a/sys-apps/ignition/files/0017-translation-support-OEM-and-oem.patch b/sys-apps/ignition/files/0017-translation-support-OEM-and-oem.patch
@@ -1,4 +1,4 @@
-From ed28e76ecd79396687137adaeee93c2381b1e95a Mon Sep 17 00:00:00 2001
+From c9da4778c983291aa55a24f21539e4447424d7eb Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Thu, 10 Nov 2022 11:58:49 +0100
 Subject: [PATCH 17/18] translation: support OEM and oem

diff --git a/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch b/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch
@@ -1,4 +1,4 @@
-From 1e5bc7ec945f2dd905235b1019c426a0cfa94e6b Mon Sep 17 00:00:00 2001
+From 8bbe8d9bd454d676402973bbb607b24e5683c9da Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <[email protected]>
 Date: Wed, 21 Dec 2022 17:25:02 +0100
 Subject: [PATCH 18/18] revert: internal/oem: drop noop OEMs