From b9803d4d976298c7aea1958674b3d48ae4f86bd2 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 3 Sep 2026 15:40:03 +0100 Subject: [PATCH 1/2] sys-apps/ignition: Version bump to 2.27.0 This drops the big flatcar -> coreos rename patch in favour of running sed at build time. Signed-off-by: James Le Cuirot --- changelog/updates/2026-08-26-ignition.md | 2 +- .../coreos-overlay/sys-apps/ignition/Manifest | 2 +- ...001-config-add-ignition-translation.patch} | 37 +- .../files/0001-sed-s-coreos-flatcar.patch | 8235 ----------------- ...002-mod-add-flatcar-ignition-0.36.2.patch} | 143 +- ...ig-v3_7-convert-ignition-2.x-to-3.x.patch} | 24 +- ...l-prv-cmdline-backport-flatcar-patch.patch | 44 + ...05-provider-qemu-apply-fw_cfg-patch.patch} | 70 +- ...ignore-fs-format-mismatches-for-the.patch} | 10 +- ...l-prv-cmdline-backport-flatcar-patch.patch | 40 - ...nfo.-.config.data-and-.config.url-v.patch} | 12 +- ...sion-handle-configuration-version-1.patch} | 10 +- ...loud-init-detection-to-initial-pars.patch} | 10 +- ...010-translation-support-OEM-and-oem.patch} | 31 +- ...nternal-exec-stages-mount-Mount-oem.patch} | 8 +- ...-vendor.patch => 0012-go-mod-vendor.patch} | 58 +- ...rtially-revert-drop-OEM-URI-support.patch} | 69 +- ...m-schema-in-newer-config-spec-versi.patch} | 12 +- .../files/0015-usr-share-oem-oem.patch | 14 +- ...-handling-of-device-mapper-when-part.patch | 142 - ...-giving-partition-number-0-to-get-th.patch | 134 - ...ow-partx-to-fail-then-check-the-stat.patch | 255 - ...n-2.26.0.ebuild => ignition-2.27.0.ebuild} | 0 .../sys-apps/ignition/ignition-9999.ebuild | 39 +- 24 files changed, 296 insertions(+), 9105 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0002-config-add-ignition-translation.patch => 0001-config-add-ignition-translation.patch} (98%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0003-mod-add-flatcar-ignition-0.36.2.patch => 0002-mod-add-flatcar-ignition-0.36.2.patch} (55%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0004-config-v3_7-convert-ignition-2.x-to-3.x.patch => 0003-config-v3_7-convert-ignition-2.x-to-3.x.patch} (77%) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-internal-prv-cmdline-backport-flatcar-patch.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0007-provider-qemu-apply-fw_cfg-patch.patch => 0005-provider-qemu-apply-fw_cfg-patch.patch} (81%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch => 0006-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch} (88%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch => 0007-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch} (94%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0010-config-version-handle-configuration-version-1.patch => 0008-config-version-handle-configuration-version-1.patch} (86%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0011-config-util-add-cloud-init-detection-to-initial-pars.patch => 0009-config-util-add-cloud-init-detection-to-initial-pars.patch} (91%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0014-translation-support-OEM-and-oem.patch => 0010-translation-support-OEM-and-oem.patch} (80%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0016-internal-exec-stages-mount-Mount-oem.patch => 0011-internal-exec-stages-mount-Mount-oem.patch} (88%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0005-vendor-go-mod-vendor.patch => 0012-go-mod-vendor.patch} (99%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0012-Partially-revert-drop-OEM-URI-support.patch => 0013-Partially-revert-drop-OEM-URI-support.patch} (72%) rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/{0013-config-Support-oem-schema-in-newer-config-spec-versi.patch => 0014-config-Support-oem-schema-in-newer-config-spec-versi.patch} (87%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/{ignition-2.26.0.ebuild => ignition-2.27.0.ebuild} (100%) diff --git a/changelog/updates/2026-08-26-ignition.md b/changelog/updates/2026-08-26-ignition.md index e68625ea221..4a8af402534 100644 --- a/changelog/updates/2026-08-26-ignition.md +++ b/changelog/updates/2026-08-26-ignition.md @@ -1 +1 @@ -- Ignition ([2.26.0](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17) (includes [2.25.1](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17), [2.25.0](https://coreos.github.io/ignition/release-notes/#ignition-2250-2025-12-11))) +- Ignition ([2.27.0](https://coreos.github.io/ignition/release-notes/#ignition-2270-2026-08-26) (includes [2.26.0](https://coreos.github.io/ignition/release-notes/#ignition-2260-2026-02-17), [2.25.1](https://coreos.github.io/ignition/release-notes/#ignition-2251-2025-12-22), [2.25.0](https://coreos.github.io/ignition/release-notes/#ignition-2250-2025-12-11))) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest index 7ebc5c7880b..45a6864585f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/Manifest @@ -1 +1 @@ -DIST ignition-2.26.0.tar.gz 8519852 BLAKE2B 9194fa46b604c2ecb29fc74e9acbd63998c0331e59ffe71aca789dd4a3e036a6021e67d7085b28f52510b0d76f79c8934adb6d44f17b45a2685c500399d47a9c SHA512 365072e3b9d11be9e0e6008d2e7fbff5a6583f393a9b1860d95ee4bccde1680306d0d063e844dd1ea59968ea4661105210d9c17cf6001a9c1d04a1861505406e +DIST ignition-2.27.0.tar.gz 4333458 BLAKE2B d8c76132621fce6053972ba45a3a70acfdfd9a212ca305a971e93741e9c37c09d67d07e9cbe6361a4c3cda1debe88587b47af4dc1557f65b3dc905b913c6245a SHA512 7f1ad2da57a196ba0d01b7f2f886f1484edb1f48b8f295f1ad9a4ef9ba2801f0d9d3e9701ec266b4a2446bbf182c50c6733b5ca069ac0c749d77ed342d6a6a9e 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/0001-config-add-ignition-translation.patch similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-config-add-ignition-translation.patch index bbca6675c93..926e54c8ce4 100644 --- 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/0001-config-add-ignition-translation.patch @@ -1,16 +1,16 @@ -From f57b41faa275285dafb9df26285e35dd34722738 Mon Sep 17 00:00:00 2001 +From 70dd79997dd9766d49a9e847d6b293b10e90198c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 26 Sep 2022 12:12:04 +0200 -Subject: [PATCH 02/19] config: add ignition translation +Subject: [PATCH 01/15] config: add ignition translation it's a merge from flatcar/ign-converter Signed-off-by: Mathieu Tortuyaux --- config/util/translate.go | 166 +++ - config/v24tov31/v24tov31.go | 729 +++++++++++++ + config/v24tov31/v24tov31.go | 728 +++++++++++++ config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++ - 3 files changed, 2587 insertions(+) + 3 files changed, 2586 insertions(+) create mode 100644 config/util/translate.go create mode 100644 config/v24tov31/v24tov31.go create mode 100644 config/v24tov31/v24tov31_test.go @@ -189,10 +189,10 @@ index 00000000..347d148c +} diff --git a/config/v24tov31/v24tov31.go b/config/v24tov31/v24tov31.go new file mode 100644 -index 00000000..46749385 +index 00000000..dd8d2d00 --- /dev/null +++ b/config/v24tov31/v24tov31.go -@@ -0,0 +1,729 @@ +@@ -0,0 +1,728 @@ +// Copyright 2020 Red Hat, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); @@ -217,13 +217,12 @@ index 00000000..46749385 + "path/filepath" + "reflect" + -+ old "github.com/flatcar/ignition/config/v2_4/types" -+ oldValidate "github.com/flatcar/ignition/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/v3_1/types" -+ "github.com/flatcar/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/util" -+ ++ old "github.com/coreos/ignition/config/v2_4/types" ++ oldValidate "github.com/coreos/ignition/config/validate" ++ "github.com/coreos/ignition/v2/config/merge" ++ "github.com/coreos/ignition/v2/config/util" ++ "github.com/coreos/ignition/v2/config/v3_1/types" ++ "github.com/coreos/ignition/v2/config/validate" +) + +// Check2_4 returns if the config is translatable but does not do any translation. @@ -924,7 +923,7 @@ index 00000000..46749385 +} diff --git a/config/v24tov31/v24tov31_test.go b/config/v24tov31/v24tov31_test.go new file mode 100644 -index 00000000..e81f6bed +index 00000000..17f7c00c --- /dev/null +++ b/config/v24tov31/v24tov31_test.go @@ -0,0 +1,1692 @@ @@ -948,13 +947,13 @@ index 00000000..e81f6bed + "fmt" + "testing" + -+ types2_4 "github.com/flatcar/ignition/config/v2_4/types" -+ types3_1 "github.com/flatcar/ignition/v2/config/v3_1/types" ++ types2_4 "github.com/coreos/ignition/config/v2_4/types" ++ types3_1 "github.com/coreos/ignition/v2/config/v3_1/types" + + "github.com/stretchr/testify/assert" + -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v24tov31" ++ "github.com/coreos/ignition/v2/config/util" ++ "github.com/coreos/ignition/v2/config/v24tov31" +) + +// Configs using _all_ the (undeprecated) fields @@ -2621,5 +2620,5 @@ index 00000000..e81f6bed + } +} -- -2.54.0 +2.55.0 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 deleted file mode 100644 index f5a791b5d74..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch +++ /dev/null @@ -1,8235 +0,0 @@ -From 4f647ad0f7b8e997b321e843d7a2c77eadf4caa3 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Thu, 20 Aug 2026 14:14:07 +0200 -Subject: [PATCH 01/19] *: sed `s/coreos/flatcar/` - -Signed-off-by: Mathieu Tortuyaux ---- - config/config.go | 4 +- - config/config_test.go | 18 +++--- - config/doc/generate.go | 2 +- - config/doc/schema.go | 2 +- - config/merge/merge.go | 6 +- - config/merge/merge_test.go | 8 +-- - config/shared/validations/unit.go | 2 +- - config/translate/translate.go | 2 +- - config/translate/translate_test.go | 4 +- - config/util/config.go | 2 +- - config/util/parsingErrors.go | 2 +- - config/v3_0/config.go | 10 ++-- - config/v3_0/config_test.go | 4 +- - config/v3_0/types/config.go | 4 +- - config/v3_0/types/config_test.go | 4 +- - config/v3_0/types/disk.go | 4 +- - config/v3_0/types/file.go | 4 +- - config/v3_0/types/file_test.go | 4 +- - config/v3_0/types/filesystem.go | 4 +- - config/v3_0/types/filesystem_test.go | 4 +- - config/v3_0/types/ignition.go | 2 +- - config/v3_0/types/mode.go | 2 +- - config/v3_0/types/mode_test.go | 4 +- - config/v3_0/types/node.go | 4 +- - config/v3_0/types/node_test.go | 4 +- - config/v3_0/types/partition.go | 4 +- - config/v3_0/types/partition_test.go | 4 +- - config/v3_0/types/path.go | 4 +- - config/v3_0/types/path_test.go | 2 +- - config/v3_0/types/raid.go | 2 +- - config/v3_0/types/raid_test.go | 4 +- - config/v3_0/types/storage.go | 4 +- - config/v3_0/types/storage_test.go | 4 +- - config/v3_0/types/systemd.go | 6 +- - config/v3_0/types/systemd_test.go | 4 +- - config/v3_0/types/unit.go | 8 +-- - config/v3_0/types/unit_test.go | 4 +- - config/v3_0/types/url.go | 4 +- - config/v3_0/types/url_test.go | 4 +- - config/v3_0/types/verification.go | 2 +- - config/v3_0/types/verification_test.go | 2 +- - config/v3_1/config.go | 14 ++--- - config/v3_1/config_test.go | 4 +- - config/v3_1/translate/translate.go | 8 +-- - config/v3_1/translate/translate_test.go | 4 +- - config/v3_1/types/config.go | 4 +- - config/v3_1/types/config_test.go | 4 +- - config/v3_1/types/disk.go | 4 +- - config/v3_1/types/file.go | 4 +- - config/v3_1/types/file_test.go | 4 +- - config/v3_1/types/filesystem.go | 4 +- - config/v3_1/types/filesystem_test.go | 4 +- - config/v3_1/types/headers.go | 2 +- - config/v3_1/types/headers_test.go | 2 +- - config/v3_1/types/ignition.go | 2 +- - config/v3_1/types/mode.go | 2 +- - config/v3_1/types/mode_test.go | 4 +- - config/v3_1/types/node.go | 4 +- - config/v3_1/types/node_test.go | 4 +- - config/v3_1/types/partition.go | 4 +- - config/v3_1/types/partition_test.go | 4 +- - config/v3_1/types/path.go | 4 +- - config/v3_1/types/path_test.go | 2 +- - config/v3_1/types/proxy.go | 2 +- - config/v3_1/types/proxy_test.go | 4 +- - config/v3_1/types/raid.go | 2 +- - config/v3_1/types/raid_test.go | 4 +- - config/v3_1/types/resource.go | 4 +- - config/v3_1/types/storage.go | 4 +- - config/v3_1/types/storage_test.go | 4 +- - config/v3_1/types/systemd.go | 6 +- - config/v3_1/types/systemd_test.go | 4 +- - config/v3_1/types/unit.go | 8 +-- - config/v3_1/types/unit_test.go | 4 +- - config/v3_1/types/url.go | 4 +- - config/v3_1/types/url_test.go | 4 +- - config/v3_1/types/verification.go | 2 +- - config/v3_1/types/verification_test.go | 2 +- - config/v3_2/config.go | 14 ++--- - config/v3_2/config_test.go | 4 +- - config/v3_2/translate/translate.go | 6 +- - config/v3_2/translate/translate_test.go | 4 +- - config/v3_2/types/config.go | 4 +- - config/v3_2/types/config_test.go | 4 +- - config/v3_2/types/custom.go | 2 +- - config/v3_2/types/disk.go | 4 +- - config/v3_2/types/file.go | 4 +- - config/v3_2/types/file_test.go | 4 +- - config/v3_2/types/filesystem.go | 4 +- - config/v3_2/types/filesystem_test.go | 4 +- - config/v3_2/types/headers.go | 2 +- - config/v3_2/types/headers_test.go | 2 +- - config/v3_2/types/ignition.go | 2 +- - config/v3_2/types/luks.go | 4 +- - config/v3_2/types/mode.go | 2 +- - config/v3_2/types/mode_test.go | 4 +- - config/v3_2/types/node.go | 4 +- - config/v3_2/types/node_test.go | 4 +- - config/v3_2/types/partition.go | 4 +- - config/v3_2/types/partition_test.go | 4 +- - config/v3_2/types/path.go | 4 +- - config/v3_2/types/path_test.go | 2 +- - config/v3_2/types/proxy.go | 2 +- - config/v3_2/types/proxy_test.go | 4 +- - config/v3_2/types/raid.go | 2 +- - config/v3_2/types/raid_test.go | 4 +- - config/v3_2/types/resource.go | 4 +- - config/v3_2/types/storage.go | 4 +- - config/v3_2/types/storage_test.go | 4 +- - config/v3_2/types/systemd.go | 6 +- - config/v3_2/types/systemd_test.go | 4 +- - config/v3_2/types/tang.go | 4 +- - config/v3_2/types/unit.go | 8 +-- - config/v3_2/types/unit_test.go | 4 +- - config/v3_2/types/url.go | 4 +- - config/v3_2/types/url_test.go | 4 +- - config/v3_2/types/verification.go | 2 +- - config/v3_2/types/verification_test.go | 2 +- - config/v3_3/config.go | 14 ++--- - config/v3_3/config_test.go | 4 +- - config/v3_3/translate/translate.go | 8 +-- - config/v3_3/translate/translate_test.go | 4 +- - config/v3_3/types/clevis.go | 4 +- - config/v3_3/types/clevis_test.go | 4 +- - config/v3_3/types/config.go | 4 +- - config/v3_3/types/config_test.go | 4 +- - config/v3_3/types/disk.go | 4 +- - config/v3_3/types/file.go | 4 +- - config/v3_3/types/file_test.go | 4 +- - config/v3_3/types/filesystem.go | 4 +- - config/v3_3/types/filesystem_test.go | 4 +- - config/v3_3/types/headers.go | 2 +- - config/v3_3/types/headers_test.go | 2 +- - config/v3_3/types/ignition.go | 2 +- - config/v3_3/types/kargs_test.go | 2 +- - config/v3_3/types/luks.go | 4 +- - config/v3_3/types/mode.go | 2 +- - config/v3_3/types/mode_test.go | 4 +- - config/v3_3/types/node.go | 4 +- - config/v3_3/types/node_test.go | 4 +- - config/v3_3/types/partition.go | 4 +- - config/v3_3/types/partition_test.go | 4 +- - config/v3_3/types/path.go | 4 +- - config/v3_3/types/path_test.go | 2 +- - config/v3_3/types/proxy.go | 2 +- - config/v3_3/types/proxy_test.go | 4 +- - config/v3_3/types/raid.go | 4 +- - config/v3_3/types/raid_test.go | 4 +- - config/v3_3/types/resource.go | 4 +- - config/v3_3/types/storage.go | 4 +- - config/v3_3/types/storage_test.go | 4 +- - config/v3_3/types/systemd.go | 6 +- - config/v3_3/types/systemd_test.go | 4 +- - config/v3_3/types/tang.go | 4 +- - config/v3_3/types/unit.go | 8 +-- - config/v3_3/types/unit_test.go | 4 +- - config/v3_3/types/url.go | 4 +- - config/v3_3/types/url_test.go | 4 +- - config/v3_3/types/verification.go | 2 +- - config/v3_3/types/verification_test.go | 2 +- - config/v3_4/config.go | 14 ++--- - config/v3_4/config_test.go | 4 +- - config/v3_4/translate/translate.go | 6 +- - config/v3_4/translate/translate_test.go | 4 +- - config/v3_4/types/clevis.go | 4 +- - config/v3_4/types/clevis_test.go | 4 +- - config/v3_4/types/config.go | 4 +- - config/v3_4/types/config_test.go | 4 +- - config/v3_4/types/disk.go | 4 +- - config/v3_4/types/file.go | 4 +- - config/v3_4/types/file_test.go | 4 +- - config/v3_4/types/filesystem.go | 4 +- - config/v3_4/types/filesystem_test.go | 4 +- - config/v3_4/types/headers.go | 2 +- - config/v3_4/types/headers_test.go | 2 +- - config/v3_4/types/ignition.go | 2 +- - config/v3_4/types/kargs_test.go | 2 +- - config/v3_4/types/luks.go | 4 +- - config/v3_4/types/mode.go | 2 +- - config/v3_4/types/mode_test.go | 4 +- - config/v3_4/types/node.go | 4 +- - config/v3_4/types/node_test.go | 4 +- - config/v3_4/types/partition.go | 4 +- - config/v3_4/types/partition_test.go | 4 +- - config/v3_4/types/path.go | 4 +- - config/v3_4/types/path_test.go | 2 +- - config/v3_4/types/proxy.go | 2 +- - config/v3_4/types/proxy_test.go | 4 +- - config/v3_4/types/raid.go | 4 +- - config/v3_4/types/raid_test.go | 4 +- - config/v3_4/types/resource.go | 4 +- - config/v3_4/types/storage.go | 4 +- - config/v3_4/types/storage_test.go | 4 +- - config/v3_4/types/systemd.go | 6 +- - config/v3_4/types/systemd_test.go | 4 +- - config/v3_4/types/tang.go | 4 +- - config/v3_4/types/tang_test.go | 4 +- - config/v3_4/types/unit.go | 8 +-- - config/v3_4/types/unit_test.go | 4 +- - config/v3_4/types/url.go | 4 +- - config/v3_4/types/url_test.go | 4 +- - config/v3_4/types/verification.go | 2 +- - config/v3_4/types/verification_test.go | 2 +- - config/v3_5/config.go | 14 ++--- - config/v3_5/config_test.go | 4 +- - config/v3_5/translate/translate.go | 6 +- - config/v3_5/translate/translate_test.go | 4 +- - config/v3_5/types/cex.go | 2 +- - config/v3_5/types/cex_test.go | 2 +- - config/v3_5/types/clevis.go | 4 +- - config/v3_5/types/clevis_test.go | 4 +- - config/v3_5/types/config.go | 4 +- - config/v3_5/types/config_test.go | 4 +- - config/v3_5/types/disk.go | 4 +- - config/v3_5/types/file.go | 4 +- - config/v3_5/types/file_test.go | 4 +- - config/v3_5/types/filesystem.go | 4 +- - config/v3_5/types/filesystem_test.go | 4 +- - config/v3_5/types/headers.go | 2 +- - config/v3_5/types/headers_test.go | 2 +- - config/v3_5/types/ignition.go | 2 +- - config/v3_5/types/kargs_test.go | 2 +- - config/v3_5/types/luks.go | 4 +- - config/v3_5/types/mode.go | 2 +- - config/v3_5/types/mode_test.go | 4 +- - config/v3_5/types/node.go | 4 +- - config/v3_5/types/node_test.go | 4 +- - config/v3_5/types/partition.go | 4 +- - config/v3_5/types/partition_test.go | 4 +- - config/v3_5/types/path.go | 4 +- - config/v3_5/types/path_test.go | 2 +- - config/v3_5/types/proxy.go | 2 +- - config/v3_5/types/proxy_test.go | 4 +- - config/v3_5/types/raid.go | 4 +- - config/v3_5/types/raid_test.go | 4 +- - config/v3_5/types/resource.go | 4 +- - config/v3_5/types/storage.go | 4 +- - config/v3_5/types/storage_test.go | 4 +- - config/v3_5/types/systemd.go | 6 +- - config/v3_5/types/systemd_test.go | 4 +- - config/v3_5/types/tang.go | 4 +- - config/v3_5/types/tang_test.go | 4 +- - config/v3_5/types/unit.go | 8 +-- - config/v3_5/types/unit_test.go | 4 +- - config/v3_5/types/url.go | 4 +- - config/v3_5/types/url_test.go | 4 +- - config/v3_5/types/verification.go | 2 +- - config/v3_5/types/verification_test.go | 2 +- - config/v3_6/config.go | 14 ++--- - config/v3_6/config_test.go | 4 +- - config/v3_6/translate/translate.go | 8 +-- - config/v3_6/translate/translate_test.go | 4 +- - config/v3_6/types/cex.go | 2 +- - config/v3_6/types/cex_test.go | 2 +- - config/v3_6/types/clevis.go | 4 +- - config/v3_6/types/clevis_test.go | 4 +- - config/v3_6/types/config.go | 4 +- - config/v3_6/types/config_test.go | 4 +- - config/v3_6/types/disk.go | 4 +- - config/v3_6/types/file.go | 4 +- - config/v3_6/types/file_test.go | 4 +- - config/v3_6/types/filesystem.go | 4 +- - config/v3_6/types/filesystem_test.go | 4 +- - config/v3_6/types/headers.go | 2 +- - config/v3_6/types/headers_test.go | 2 +- - config/v3_6/types/ignition.go | 2 +- - config/v3_6/types/kargs_test.go | 2 +- - config/v3_6/types/luks.go | 4 +- - config/v3_6/types/mode.go | 2 +- - config/v3_6/types/mode_test.go | 4 +- - config/v3_6/types/node.go | 4 +- - config/v3_6/types/node_test.go | 4 +- - config/v3_6/types/partition.go | 4 +- - config/v3_6/types/partition_test.go | 4 +- - config/v3_6/types/path.go | 4 +- - config/v3_6/types/path_test.go | 2 +- - config/v3_6/types/proxy.go | 2 +- - config/v3_6/types/proxy_test.go | 4 +- - config/v3_6/types/raid.go | 4 +- - config/v3_6/types/raid_test.go | 4 +- - config/v3_6/types/resource.go | 4 +- - config/v3_6/types/storage.go | 4 +- - config/v3_6/types/storage_test.go | 4 +- - config/v3_6/types/systemd.go | 6 +- - config/v3_6/types/systemd_test.go | 4 +- - config/v3_6/types/tang.go | 4 +- - config/v3_6/types/tang_test.go | 4 +- - config/v3_6/types/unit.go | 8 +-- - config/v3_6/types/unit_test.go | 4 +- - config/v3_6/types/url.go | 4 +- - config/v3_6/types/url_test.go | 4 +- - config/v3_6/types/verification.go | 2 +- - config/v3_6/types/verification_test.go | 2 +- - config/v3_7_experimental/config.go | 14 ++--- - config/v3_7_experimental/config_test.go | 4 +- - .../v3_7_experimental/translate/translate.go | 6 +- - .../translate/translate_test.go | 4 +- - config/v3_7_experimental/types/cex.go | 2 +- - config/v3_7_experimental/types/cex_test.go | 2 +- - config/v3_7_experimental/types/clevis.go | 4 +- - config/v3_7_experimental/types/clevis_test.go | 4 +- - config/v3_7_experimental/types/config.go | 4 +- - config/v3_7_experimental/types/config_test.go | 4 +- - config/v3_7_experimental/types/disk.go | 4 +- - config/v3_7_experimental/types/file.go | 4 +- - config/v3_7_experimental/types/file_test.go | 4 +- - config/v3_7_experimental/types/filesystem.go | 4 +- - .../types/filesystem_test.go | 4 +- - config/v3_7_experimental/types/headers.go | 2 +- - .../v3_7_experimental/types/headers_test.go | 2 +- - config/v3_7_experimental/types/ignition.go | 2 +- - config/v3_7_experimental/types/kargs_test.go | 2 +- - config/v3_7_experimental/types/luks.go | 4 +- - config/v3_7_experimental/types/mode.go | 2 +- - config/v3_7_experimental/types/mode_test.go | 4 +- - config/v3_7_experimental/types/node.go | 4 +- - config/v3_7_experimental/types/node_test.go | 4 +- - config/v3_7_experimental/types/partition.go | 4 +- - .../v3_7_experimental/types/partition_test.go | 4 +- - config/v3_7_experimental/types/path.go | 4 +- - config/v3_7_experimental/types/path_test.go | 2 +- - config/v3_7_experimental/types/proxy.go | 2 +- - config/v3_7_experimental/types/proxy_test.go | 4 +- - config/v3_7_experimental/types/raid.go | 4 +- - config/v3_7_experimental/types/raid_test.go | 4 +- - config/v3_7_experimental/types/resource.go | 4 +- - config/v3_7_experimental/types/storage.go | 4 +- - .../v3_7_experimental/types/storage_test.go | 4 +- - config/v3_7_experimental/types/systemd.go | 6 +- - .../v3_7_experimental/types/systemd_test.go | 4 +- - config/v3_7_experimental/types/tang.go | 4 +- - config/v3_7_experimental/types/tang_test.go | 4 +- - config/v3_7_experimental/types/unit.go | 8 +-- - config/v3_7_experimental/types/unit_test.go | 4 +- - config/v3_7_experimental/types/url.go | 4 +- - config/v3_7_experimental/types/url_test.go | 4 +- - .../v3_7_experimental/types/verification.go | 2 +- - .../types/verification_test.go | 2 +- - config/validate/validate.go | 4 +- - config/validate/validate_test.go | 2 +- - go.mod | 2 +- - internal/apply/apply.go | 30 +++++----- - internal/distro/distro.go | 2 +- - internal/doc/main.go | 18 +++--- - internal/exec/config_fetcher.go | 18 +++--- - internal/exec/engine.go | 22 +++---- - internal/exec/stages/disks/disks.go | 16 ++--- - internal/exec/stages/disks/filesystems.go | 8 +-- - internal/exec/stages/disks/luks.go | 12 ++-- - internal/exec/stages/disks/partitions.go | 12 ++-- - internal/exec/stages/disks/raid.go | 6 +- - internal/exec/stages/fetch/fetch.go | 12 ++-- - .../stages/fetch_offline/fetch-offline.go | 16 ++--- - .../fetch_offline/fetch_offline_test.go | 4 +- - internal/exec/stages/files/files.go | 14 ++--- - internal/exec/stages/files/files_test.go | 4 +- - .../exec/stages/files/filesystemEntries.go | 12 ++-- - internal/exec/stages/files/passwd.go | 4 +- - internal/exec/stages/files/units.go | 12 ++-- - internal/exec/stages/files/units_test.go | 4 +- - internal/exec/stages/kargs/kargs.go | 14 ++--- - internal/exec/stages/mount/mount.go | 16 ++--- - internal/exec/stages/stages.go | 10 ++-- - internal/exec/stages/umount/umount.go | 14 ++--- - internal/exec/util/blkid.go | 2 +- - internal/exec/util/file.go | 10 ++-- - internal/exec/util/passwd.go | 8 +-- - internal/exec/util/selinux.go | 2 +- - internal/exec/util/unit.go | 4 +- - internal/exec/util/user_group_lookup_test.go | 2 +- - internal/exec/util/util.go | 6 +- - internal/main.go | 18 +++--- - internal/platform/platform.go | 10 ++-- - internal/providers/akamai/akamai.go | 8 +-- - internal/providers/aliyun/aliyun.go | 8 +-- - internal/providers/applehv/applehv.go | 10 ++-- - internal/providers/aws/aws.go | 12 ++-- - internal/providers/azure/azure.go | 16 ++--- - internal/providers/azurestack/azurestack.go | 8 +-- - internal/providers/cloudstack/cloudstack.go | 16 ++--- - internal/providers/cmdline/cmdline.go | 12 ++-- - .../providers/digitalocean/digitalocean.go | 8 +-- - internal/providers/exoscale/exoscale.go | 8 +-- - internal/providers/file/file.go | 8 +-- - internal/providers/gcp/gcp.go | 8 +-- - internal/providers/hetzner/hetzner.go | 8 +-- - internal/providers/hyperv/kvp.go | 12 ++-- - internal/providers/ibmcloud/ibmcloud.go | 14 ++--- - internal/providers/kubevirt/kubevirt.go | 14 ++--- - internal/providers/metal/metal.go | 8 +-- - internal/providers/nutanix/nutanix.go | 14 ++--- - .../nvidiabluefield/nvidiabluefield.go | 10 ++-- - internal/providers/openstack/openstack.go | 16 ++--- - internal/providers/oraclecloud/oraclecloud.go | 8 +-- - internal/providers/packet/packet.go | 8 +-- - internal/providers/powervs/powervs.go | 14 ++--- - internal/providers/proxmoxve/proxmoxve.go | 14 ++--- - internal/providers/qemu/qemu_blockdev.go | 12 ++-- - internal/providers/qemu/qemu_fwcfg.go | 10 ++-- - internal/providers/scaleway/scaleway.go | 8 +-- - internal/providers/system/system.go | 14 ++--- - internal/providers/upcloud/upcloud.go | 8 +-- - internal/providers/util/config.go | 6 +- - internal/providers/util/file.go | 4 +- - internal/providers/util/unzip_test.go | 2 +- - internal/providers/virtualbox/virtualbox.go | 10 ++-- - internal/providers/vmware/vmware_amd64.go | 8 +-- - .../providers/vmware/vmware_unsupported.go | 6 +- - internal/providers/vultr/vultr.go | 8 +-- - internal/providers/zvm/zvm.go | 14 ++--- - internal/register/providers.go | 60 +++++++++---------- - internal/register/stages.go | 14 ++--- - internal/resource/http.go | 14 ++--- - internal/resource/url.go | 10 ++-- - internal/resource/url_test.go | 6 +- - internal/sgdisk/sgdisk.go | 8 +-- - internal/state/state.go | 2 +- - internal/util/tools/docs/docs.go | 2 +- - internal/util/verification.go | 2 +- - internal/util/verification_test.go | 2 +- - tests/blackbox_test.go | 12 ++-- - tests/filesystem.go | 4 +- - tests/negative/files/invalid_hash.go | 4 +- - tests/negative/files/link.go | 4 +- - tests/negative/files/missing_file.go | 4 +- - tests/negative/files/preexisting_nodes.go | 4 +- - tests/negative/filesystems/creation.go | 4 +- - .../negative/filesystems/mount_filesystem.go | 4 +- - tests/negative/filesystems/no_device.go | 4 +- - tests/negative/filesystems/symlinks.go | 4 +- - tests/negative/general/config.go | 4 +- - tests/negative/luks/creation.go | 4 +- - tests/negative/partitions/simple.go | 4 +- - tests/negative/partitions/zeroes.go | 4 +- - tests/negative/proxy/http.go | 4 +- - tests/negative/regression/filesystem.go | 4 +- - tests/negative/security/tls.go | 6 +- - tests/negative/timeouts/timeouts.go | 4 +- - tests/positive/files/directory.go | 4 +- - tests/positive/files/file.go | 6 +- - tests/positive/files/hash.go | 6 +- - tests/positive/files/link.go | 6 +- - tests/positive/files/remote.go | 6 +- - tests/positive/files/units.go | 4 +- - tests/positive/filesystems/creation.go | 4 +- - .../positive/filesystems/mount_filesystem.go | 4 +- - .../filesystems/reformat_filesystem.go | 6 +- - .../positive/filesystems/reuse_filesystem.go | 6 +- - tests/positive/general/baseconfigsmerging.go | 4 +- - tests/positive/general/general.go | 6 +- - tests/positive/general/preemption.go | 4 +- - tests/positive/luks/creation.go | 4 +- - tests/positive/partitions/complex-mb.go | 4 +- - tests/positive/partitions/creation-mb.go | 4 +- - tests/positive/partitions/deletion.go | 4 +- - tests/positive/partitions/mixed.go | 4 +- - tests/positive/partitions/no-op.go | 4 +- - tests/positive/partitions/verification.go | 4 +- - tests/positive/partitions/wipe.go | 4 +- - tests/positive/partitions/zeros.go | 4 +- - tests/positive/passwd/users.go | 4 +- - tests/positive/proxy/http.go | 4 +- - tests/positive/regression/filesystem.go | 4 +- - tests/positive/security/tls.go | 8 +-- - tests/positive/systemd/create_unit.go | 4 +- - tests/positive/systemd/modify_service.go | 4 +- - tests/positive/timeouts/timeouts.go | 4 +- - tests/register/register.go | 18 +++--- - tests/registry/registry.go | 40 ++++++------- - tests/servers/servers.go | 2 +- - tests/validator.go | 4 +- - validate/main.go | 4 +- - 472 files changed, 1239 insertions(+), 1239 deletions(-) - -diff --git a/config/config.go b/config/config.go -index 66b602c4..f361e865 100644 ---- a/config/config.go -+++ b/config/config.go -@@ -15,8 +15,8 @@ - package config - - import ( -- exp "github.com/coreos/ignition/v2/config/v3_7_experimental" -- types_exp "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ exp "github.com/flatcar/ignition/v2/config/v3_7_experimental" -+ types_exp "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - - "github.com/coreos/vcontext/report" - ) -diff --git a/config/config_test.go b/config/config_test.go -index 64d970d3..4f6142de 100644 ---- a/config/config_test.go -+++ b/config/config_test.go -@@ -19,15 +19,15 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- v3_0 "github.com/coreos/ignition/v2/config/v3_0/types" -- v3_1 "github.com/coreos/ignition/v2/config/v3_1/types" -- v3_2 "github.com/coreos/ignition/v2/config/v3_2/types" -- v3_3 "github.com/coreos/ignition/v2/config/v3_3/types" -- v3_4 "github.com/coreos/ignition/v2/config/v3_4/types" -- v3_5 "github.com/coreos/ignition/v2/config/v3_5/types" -- v3_6 "github.com/coreos/ignition/v2/config/v3_6/types" -- v3_7 "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ v3_0 "github.com/flatcar/ignition/v2/config/v3_0/types" -+ v3_1 "github.com/flatcar/ignition/v2/config/v3_1/types" -+ v3_2 "github.com/flatcar/ignition/v2/config/v3_2/types" -+ v3_3 "github.com/flatcar/ignition/v2/config/v3_3/types" -+ v3_4 "github.com/flatcar/ignition/v2/config/v3_4/types" -+ v3_5 "github.com/flatcar/ignition/v2/config/v3_5/types" -+ v3_6 "github.com/flatcar/ignition/v2/config/v3_6/types" -+ v3_7 "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - type typeSet map[reflect.Type]struct{} -diff --git a/config/doc/generate.go b/config/doc/generate.go -index 9dd3e4b7..ea2f36f3 100644 ---- a/config/doc/generate.go -+++ b/config/doc/generate.go -@@ -20,7 +20,7 @@ import ( - "reflect" - "strings" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - type generator struct { -diff --git a/config/doc/schema.go b/config/doc/schema.go -index 222ad601..374ddb4b 100644 ---- a/config/doc/schema.go -+++ b/config/doc/schema.go -@@ -23,7 +23,7 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/mitchellh/copystructure" -diff --git a/config/merge/merge.go b/config/merge/merge.go -index 1ba91b3d..f2bcc274 100644 ---- a/config/merge/merge.go -+++ b/config/merge/merge.go -@@ -19,7 +19,7 @@ import ( - "reflect" - "strings" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - ) -@@ -236,7 +236,7 @@ func mergeStruct(parent reflect.Value, parentPath path.ContextPath, child reflec - case kind == reflect.Ptr && !parentField.IsNil() && !childField.IsNil() && parentField.Elem().Kind() == reflect.Struct: - // we're not supposed to have struct pointers, but some - // ended up in the Clevis and Luks structs in spec 3.2.0 -- // https://github.com/coreos/ignition/issues/1132 -+ // https://github.com/flatcar/ignition/issues/1132 - resultField.Set(mergeStruct(parentField.Elem(), parentFieldPath, childField.Elem(), childFieldPath, resultFieldPath, transcript).Addr()) - transcribeOne(parentFieldPath, resultFieldPath, transcript) - transcribeOne(childFieldPath, resultFieldPath, transcript) -@@ -378,7 +378,7 @@ func transcribe(fromPath path.ContextPath, toPath path.ContextPath, value reflec - if value.Elem().Kind() == reflect.Struct { - // we're not supposed to have struct pointers, but some - // ended up in the Clevis and Luks structs in spec 3.2.0 -- // https://github.com/coreos/ignition/issues/1132 -+ // https://github.com/flatcar/ignition/issues/1132 - return transcribe(fromPath, toPath, value.Elem(), fieldMeta, transcript) - } - transcribeOne(fromPath, toPath, transcript) -diff --git a/config/merge/merge_test.go b/config/merge/merge_test.go -index d0c1d7f2..2aab24c4 100644 ---- a/config/merge/merge_test.go -+++ b/config/merge/merge_test.go -@@ -17,9 +17,9 @@ package merge - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- v3_2 "github.com/coreos/ignition/v2/config/v3_2/types" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ v3_2 "github.com/flatcar/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - - "github.com/coreos/vcontext/path" - "github.com/stretchr/testify/assert" -@@ -1352,7 +1352,7 @@ func TestMerge(t *testing.T) { - // We are explicitly testing 3.2.0 because it mistakenly has struct - // pointers. These should not exist but ended up in the Clevis & Luks - // structs in spec 3.2.0. --// https://github.com/coreos/ignition/issues/1132 -+// https://github.com/flatcar/ignition/issues/1132 - func TestMergeStructPointers(t *testing.T) { - type test struct { - in1 v3_2.Config -diff --git a/config/shared/validations/unit.go b/config/shared/validations/unit.go -index 57744c31..273ccbe0 100644 ---- a/config/shared/validations/unit.go -+++ b/config/shared/validations/unit.go -@@ -17,7 +17,7 @@ - package validations - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/go-systemd/v22/unit" - ) -diff --git a/config/translate/translate.go b/config/translate/translate.go -index 05d8ce2c..1195e50b 100644 ---- a/config/translate/translate.go -+++ b/config/translate/translate.go -@@ -18,7 +18,7 @@ import ( - "fmt" - "reflect" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - /* -diff --git a/config/translate/translate_test.go b/config/translate/translate_test.go -index 5d1adda9..dee790f1 100644 ---- a/config/translate/translate_test.go -+++ b/config/translate/translate_test.go -@@ -19,8 +19,8 @@ import ( - - "github.com/stretchr/testify/assert" - -- "github.com/coreos/ignition/v2/config/translate/tests/pkga" -- "github.com/coreos/ignition/v2/config/translate/tests/pkgb" -+ "github.com/flatcar/ignition/v2/config/translate/tests/pkga" -+ "github.com/flatcar/ignition/v2/config/translate/tests/pkgb" - ) - - // Note: we need different input and output types which unfortunately means a lot of tests -diff --git a/config/util/config.go b/config/util/config.go -index 0b676698..3b9bb22f 100644 ---- a/config/util/config.go -+++ b/config/util/config.go -@@ -15,7 +15,7 @@ - package util - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/util/parsingErrors.go b/config/util/parsingErrors.go -index 2af85e2b..865d75d2 100644 ---- a/config/util/parsingErrors.go -+++ b/config/util/parsingErrors.go -@@ -17,7 +17,7 @@ package util - import ( - "encoding/json" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/config.go b/config/v3_0/config.go -index ca32f7ad..a00e33f0 100644 ---- a/config/v3_0/config.go -+++ b/config/v3_0/config.go -@@ -15,11 +15,11 @@ - package v3_0 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_0/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_0/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/config_test.go b/config/v3_0/config_test.go -index f26d98c4..a4e757c4 100644 ---- a/config/v3_0/config_test.go -+++ b/config/v3_0/config_test.go -@@ -17,8 +17,8 @@ package v3_0 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_0/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_0/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_0/types/config.go b/config/v3_0/types/config.go -index 1ac29594..9152041e 100644 ---- a/config/v3_0/types/config.go -+++ b/config/v3_0/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_0/types/config_test.go b/config/v3_0/types/config_test.go -index da8cfa26..b7b18bdb 100644 ---- a/config/v3_0/types/config_test.go -+++ b/config/v3_0/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/disk.go b/config/v3_0/types/disk.go -index bbb073ab..dc201c31 100644 ---- a/config/v3_0/types/disk.go -+++ b/config/v3_0/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/file.go b/config/v3_0/types/file.go -index 5fa9ca8b..43291675 100644 ---- a/config/v3_0/types/file.go -+++ b/config/v3_0/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/file_test.go b/config/v3_0/types/file_test.go -index ca0e3582..ad33e454 100644 ---- a/config/v3_0/types/file_test.go -+++ b/config/v3_0/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_0/types/filesystem.go b/config/v3_0/types/filesystem.go -index 08d1e8ef..ae9f719a 100644 ---- a/config/v3_0/types/filesystem.go -+++ b/config/v3_0/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/filesystem_test.go b/config/v3_0/types/filesystem_test.go -index 93b1bcea..19d9d62a 100644 ---- a/config/v3_0/types/filesystem_test.go -+++ b/config/v3_0/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_0/types/ignition.go b/config/v3_0/types/ignition.go -index 7a4d3cdb..4d8482f4 100644 ---- a/config/v3_0/types/ignition.go -+++ b/config/v3_0/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/mode.go b/config/v3_0/types/mode.go -index 6021b915..8acc4e75 100644 ---- a/config/v3_0/types/mode.go -+++ b/config/v3_0/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_0/types/mode_test.go b/config/v3_0/types/mode_test.go -index addf4afa..e9a243ce 100644 ---- a/config/v3_0/types/mode_test.go -+++ b/config/v3_0/types/mode_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_0/types/node.go b/config/v3_0/types/node.go -index fb41f1f0..36e79157 100644 ---- a/config/v3_0/types/node.go -+++ b/config/v3_0/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/node_test.go b/config/v3_0/types/node_test.go -index 265db7f1..11087ecf 100644 ---- a/config/v3_0/types/node_test.go -+++ b/config/v3_0/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/partition.go b/config/v3_0/types/partition.go -index 84be0cd9..46e873d7 100644 ---- a/config/v3_0/types/partition.go -+++ b/config/v3_0/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/partition_test.go b/config/v3_0/types/partition_test.go -index 728aead6..dcd3b8de 100644 ---- a/config/v3_0/types/partition_test.go -+++ b/config/v3_0/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_0/types/path.go b/config/v3_0/types/path.go -index c06fccf1..4266034a 100644 ---- a/config/v3_0/types/path.go -+++ b/config/v3_0/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_0/types/path_test.go b/config/v3_0/types/path_test.go -index 98960487..b7f7598b 100644 ---- a/config/v3_0/types/path_test.go -+++ b/config/v3_0/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_0/types/raid.go b/config/v3_0/types/raid.go -index 9c861fcb..3b746c1c 100644 ---- a/config/v3_0/types/raid.go -+++ b/config/v3_0/types/raid.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/raid_test.go b/config/v3_0/types/raid_test.go -index 34861605..639ecea5 100644 ---- a/config/v3_0/types/raid_test.go -+++ b/config/v3_0/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/storage.go b/config/v3_0/types/storage.go -index 24668954..d93d4678 100644 ---- a/config/v3_0/types/storage.go -+++ b/config/v3_0/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/storage_test.go b/config/v3_0/types/storage_test.go -index f106deb8..6d42a772 100644 ---- a/config/v3_0/types/storage_test.go -+++ b/config/v3_0/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/systemd.go b/config/v3_0/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_0/types/systemd.go -+++ b/config/v3_0/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/systemd_test.go b/config/v3_0/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_0/types/systemd_test.go -+++ b/config/v3_0/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_0/types/unit.go b/config/v3_0/types/unit.go -index 786debae..3505d5f4 100644 ---- a/config/v3_0/types/unit.go -+++ b/config/v3_0/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/unit_test.go b/config/v3_0/types/unit_test.go -index b0b2e884..3a22e081 100644 ---- a/config/v3_0/types/unit_test.go -+++ b/config/v3_0/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go -index 6a1f9397..2d8c44b1 100644 ---- a/config/v3_0/types/url.go -+++ b/config/v3_0/types/url.go -@@ -19,8 +19,8 @@ import ( - - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_0/types/url_test.go b/config/v3_0/types/url_test.go -index 46674d7c..12dcdee0 100644 ---- a/config/v3_0/types/url_test.go -+++ b/config/v3_0/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_0/types/verification.go b/config/v3_0/types/verification.go -index 23b7d7ad..e37f0e3f 100644 ---- a/config/v3_0/types/verification.go -+++ b/config/v3_0/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_0/types/verification_test.go b/config/v3_0/types/verification_test.go -index 1ec23b00..243a8884 100644 ---- a/config/v3_0/types/verification_test.go -+++ b/config/v3_0/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/config.go b/config/v3_1/config.go -index a40ae56c..e413ee25 100644 ---- a/config/v3_1/config.go -+++ b/config/v3_1/config.go -@@ -15,13 +15,13 @@ - package v3_1 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_0" -- "github.com/coreos/ignition/v2/config/v3_1/translate" -- "github.com/coreos/ignition/v2/config/v3_1/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_0" -+ "github.com/flatcar/ignition/v2/config/v3_1/translate" -+ "github.com/flatcar/ignition/v2/config/v3_1/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/config_test.go b/config/v3_1/config_test.go -index 6c27691b..5b6a1d3f 100644 ---- a/config/v3_1/config_test.go -+++ b/config/v3_1/config_test.go -@@ -17,8 +17,8 @@ package v3_1 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_1/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_1/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_1/translate/translate.go b/config/v3_1/translate/translate.go -index 5921c42c..9217cc0a 100644 ---- a/config/v3_1/translate/translate.go -+++ b/config/v3_1/translate/translate.go -@@ -15,10 +15,10 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- "github.com/coreos/ignition/v2/config/util" -- old_types "github.com/coreos/ignition/v2/config/v3_0/types" -- "github.com/coreos/ignition/v2/config/v3_1/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ "github.com/flatcar/ignition/v2/config/util" -+ old_types "github.com/flatcar/ignition/v2/config/v3_0/types" -+ "github.com/flatcar/ignition/v2/config/v3_1/types" - ) - - func translateFilesystem(old old_types.Filesystem) (ret types.Filesystem) { -diff --git a/config/v3_1/translate/translate_test.go b/config/v3_1/translate/translate_test.go -index 84761a30..ed6f58eb 100644 ---- a/config/v3_1/translate/translate_test.go -+++ b/config/v3_1/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_0/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_0/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_1/types/config.go b/config/v3_1/types/config.go -index 3cebde7f..20314a03 100644 ---- a/config/v3_1/types/config.go -+++ b/config/v3_1/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_1/types/config_test.go b/config/v3_1/types/config_test.go -index da8cfa26..b7b18bdb 100644 ---- a/config/v3_1/types/config_test.go -+++ b/config/v3_1/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/disk.go b/config/v3_1/types/disk.go -index bbb073ab..dc201c31 100644 ---- a/config/v3_1/types/disk.go -+++ b/config/v3_1/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/file.go b/config/v3_1/types/file.go -index 97aa84a7..51e9bae8 100644 ---- a/config/v3_1/types/file.go -+++ b/config/v3_1/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/file_test.go b/config/v3_1/types/file_test.go -index f44bf890..bcd01746 100644 ---- a/config/v3_1/types/file_test.go -+++ b/config/v3_1/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_1/types/filesystem.go b/config/v3_1/types/filesystem.go -index 8b07e3b9..149dead1 100644 ---- a/config/v3_1/types/filesystem.go -+++ b/config/v3_1/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/filesystem_test.go b/config/v3_1/types/filesystem_test.go -index 94f6b0a2..67bc42f6 100644 ---- a/config/v3_1/types/filesystem_test.go -+++ b/config/v3_1/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_1/types/headers.go b/config/v3_1/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_1/types/headers.go -+++ b/config/v3_1/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_1/types/headers_test.go b/config/v3_1/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_1/types/headers_test.go -+++ b/config/v3_1/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_1/types/ignition.go b/config/v3_1/types/ignition.go -index 689b6093..5e9cb356 100644 ---- a/config/v3_1/types/ignition.go -+++ b/config/v3_1/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/mode.go b/config/v3_1/types/mode.go -index 6021b915..8acc4e75 100644 ---- a/config/v3_1/types/mode.go -+++ b/config/v3_1/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_1/types/mode_test.go b/config/v3_1/types/mode_test.go -index addf4afa..e9a243ce 100644 ---- a/config/v3_1/types/mode_test.go -+++ b/config/v3_1/types/mode_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_1/types/node.go b/config/v3_1/types/node.go -index fb41f1f0..36e79157 100644 ---- a/config/v3_1/types/node.go -+++ b/config/v3_1/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/node_test.go b/config/v3_1/types/node_test.go -index 265db7f1..11087ecf 100644 ---- a/config/v3_1/types/node_test.go -+++ b/config/v3_1/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/partition.go b/config/v3_1/types/partition.go -index 84be0cd9..46e873d7 100644 ---- a/config/v3_1/types/partition.go -+++ b/config/v3_1/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/partition_test.go b/config/v3_1/types/partition_test.go -index 728aead6..dcd3b8de 100644 ---- a/config/v3_1/types/partition_test.go -+++ b/config/v3_1/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_1/types/path.go b/config/v3_1/types/path.go -index c06fccf1..4266034a 100644 ---- a/config/v3_1/types/path.go -+++ b/config/v3_1/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_1/types/path_test.go b/config/v3_1/types/path_test.go -index 98960487..b7f7598b 100644 ---- a/config/v3_1/types/path_test.go -+++ b/config/v3_1/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_1/types/proxy.go b/config/v3_1/types/proxy.go -index 4a60087f..13b7501e 100644 ---- a/config/v3_1/types/proxy.go -+++ b/config/v3_1/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/proxy_test.go b/config/v3_1/types/proxy_test.go -index e9429421..17a52956 100644 ---- a/config/v3_1/types/proxy_test.go -+++ b/config/v3_1/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/raid.go b/config/v3_1/types/raid.go -index 9c861fcb..3b746c1c 100644 ---- a/config/v3_1/types/raid.go -+++ b/config/v3_1/types/raid.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/raid_test.go b/config/v3_1/types/raid_test.go -index 34861605..639ecea5 100644 ---- a/config/v3_1/types/raid_test.go -+++ b/config/v3_1/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/resource.go b/config/v3_1/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_1/types/resource.go -+++ b/config/v3_1/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/storage.go b/config/v3_1/types/storage.go -index 24668954..d93d4678 100644 ---- a/config/v3_1/types/storage.go -+++ b/config/v3_1/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/storage_test.go b/config/v3_1/types/storage_test.go -index f106deb8..6d42a772 100644 ---- a/config/v3_1/types/storage_test.go -+++ b/config/v3_1/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/systemd.go b/config/v3_1/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_1/types/systemd.go -+++ b/config/v3_1/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/systemd_test.go b/config/v3_1/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_1/types/systemd_test.go -+++ b/config/v3_1/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_1/types/unit.go b/config/v3_1/types/unit.go -index 786debae..3505d5f4 100644 ---- a/config/v3_1/types/unit.go -+++ b/config/v3_1/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/unit_test.go b/config/v3_1/types/unit_test.go -index b0b2e884..3a22e081 100644 ---- a/config/v3_1/types/unit_test.go -+++ b/config/v3_1/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/url.go b/config/v3_1/types/url.go -index 6a1f9397..2d8c44b1 100644 ---- a/config/v3_1/types/url.go -+++ b/config/v3_1/types/url.go -@@ -19,8 +19,8 @@ import ( - - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_1/types/url_test.go b/config/v3_1/types/url_test.go -index 46674d7c..12dcdee0 100644 ---- a/config/v3_1/types/url_test.go -+++ b/config/v3_1/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_1/types/verification.go b/config/v3_1/types/verification.go -index e410f98a..2bd16354 100644 ---- a/config/v3_1/types/verification.go -+++ b/config/v3_1/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_1/types/verification_test.go b/config/v3_1/types/verification_test.go -index 6c0b3b2b..88fa0323 100644 ---- a/config/v3_1/types/verification_test.go -+++ b/config/v3_1/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/config.go b/config/v3_2/config.go -index c6c7d94d..e324f848 100644 ---- a/config/v3_2/config.go -+++ b/config/v3_2/config.go -@@ -15,13 +15,13 @@ - package v3_2 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_1" -- "github.com/coreos/ignition/v2/config/v3_2/translate" -- "github.com/coreos/ignition/v2/config/v3_2/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_1" -+ "github.com/flatcar/ignition/v2/config/v3_2/translate" -+ "github.com/flatcar/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/config_test.go b/config/v3_2/config_test.go -index 0fb1d221..80d95b51 100644 ---- a/config/v3_2/config_test.go -+++ b/config/v3_2/config_test.go -@@ -17,8 +17,8 @@ package v3_2 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_2/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_2/translate/translate.go b/config/v3_2/translate/translate.go -index 0fd4f420..323d3bf8 100644 ---- a/config/v3_2/translate/translate.go -+++ b/config/v3_2/translate/translate.go -@@ -15,9 +15,9 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- old_types "github.com/coreos/ignition/v2/config/v3_1/types" -- "github.com/coreos/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ old_types "github.com/flatcar/ignition/v2/config/v3_1/types" -+ "github.com/flatcar/ignition/v2/config/v3_2/types" - ) - - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { -diff --git a/config/v3_2/translate/translate_test.go b/config/v3_2/translate/translate_test.go -index 72d0b359..fcea2c70 100644 ---- a/config/v3_2/translate/translate_test.go -+++ b/config/v3_2/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_1/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_1/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_2/types/config.go b/config/v3_2/types/config.go -index 0e2fc370..53b042c3 100644 ---- a/config/v3_2/types/config.go -+++ b/config/v3_2/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_2/types/config_test.go b/config/v3_2/types/config_test.go -index da8cfa26..b7b18bdb 100644 ---- a/config/v3_2/types/config_test.go -+++ b/config/v3_2/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/custom.go b/config/v3_2/types/custom.go -index 2a1231cb..bcde76fb 100644 ---- a/config/v3_2/types/custom.go -+++ b/config/v3_2/types/custom.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/disk.go b/config/v3_2/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_2/types/disk.go -+++ b/config/v3_2/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/file.go b/config/v3_2/types/file.go -index 4e7566bd..f86d520b 100644 ---- a/config/v3_2/types/file.go -+++ b/config/v3_2/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/file_test.go b/config/v3_2/types/file_test.go -index 449e0700..5aa2e87c 100644 ---- a/config/v3_2/types/file_test.go -+++ b/config/v3_2/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_2/types/filesystem.go b/config/v3_2/types/filesystem.go -index 3bf064f3..9e5c5f2b 100644 ---- a/config/v3_2/types/filesystem.go -+++ b/config/v3_2/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/filesystem_test.go b/config/v3_2/types/filesystem_test.go -index 1f8db903..6e710426 100644 ---- a/config/v3_2/types/filesystem_test.go -+++ b/config/v3_2/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_2/types/headers.go b/config/v3_2/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_2/types/headers.go -+++ b/config/v3_2/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_2/types/headers_test.go b/config/v3_2/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_2/types/headers_test.go -+++ b/config/v3_2/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_2/types/ignition.go b/config/v3_2/types/ignition.go -index 190445bd..1fbcf8c4 100644 ---- a/config/v3_2/types/ignition.go -+++ b/config/v3_2/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/luks.go b/config/v3_2/types/luks.go -index 123392b2..c80fc8d2 100644 ---- a/config/v3_2/types/luks.go -+++ b/config/v3_2/types/luks.go -@@ -17,8 +17,8 @@ package types - import ( - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/mode.go b/config/v3_2/types/mode.go -index ad3e51c2..8f15a8cb 100644 ---- a/config/v3_2/types/mode.go -+++ b/config/v3_2/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_2/types/mode_test.go b/config/v3_2/types/mode_test.go -index 53e37a6b..a8fa7a81 100644 ---- a/config/v3_2/types/mode_test.go -+++ b/config/v3_2/types/mode_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_2/types/node.go b/config/v3_2/types/node.go -index 248276e7..f4e94f9e 100644 ---- a/config/v3_2/types/node.go -+++ b/config/v3_2/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/node_test.go b/config/v3_2/types/node_test.go -index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_2/types/node_test.go -+++ b/config/v3_2/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/partition.go b/config/v3_2/types/partition.go -index 1b2d97ed..6603af3b 100644 ---- a/config/v3_2/types/partition.go -+++ b/config/v3_2/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/partition_test.go b/config/v3_2/types/partition_test.go -index a1e1623f..9f8e7997 100644 ---- a/config/v3_2/types/partition_test.go -+++ b/config/v3_2/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_2/types/path.go b/config/v3_2/types/path.go -index 131e300c..cb48e341 100644 ---- a/config/v3_2/types/path.go -+++ b/config/v3_2/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_2/types/path_test.go b/config/v3_2/types/path_test.go -index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_2/types/path_test.go -+++ b/config/v3_2/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_2/types/proxy.go b/config/v3_2/types/proxy.go -index d48d210a..de146a99 100644 ---- a/config/v3_2/types/proxy.go -+++ b/config/v3_2/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/proxy_test.go b/config/v3_2/types/proxy_test.go -index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_2/types/proxy_test.go -+++ b/config/v3_2/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/raid.go b/config/v3_2/types/raid.go -index 5ae4f8c0..c3324bab 100644 ---- a/config/v3_2/types/raid.go -+++ b/config/v3_2/types/raid.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/raid_test.go b/config/v3_2/types/raid_test.go -index 34861605..639ecea5 100644 ---- a/config/v3_2/types/raid_test.go -+++ b/config/v3_2/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/resource.go b/config/v3_2/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_2/types/resource.go -+++ b/config/v3_2/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/storage.go b/config/v3_2/types/storage.go -index 5cec008d..5017849f 100644 ---- a/config/v3_2/types/storage.go -+++ b/config/v3_2/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/storage_test.go b/config/v3_2/types/storage_test.go -index 4667b8d2..3aeb8d15 100644 ---- a/config/v3_2/types/storage_test.go -+++ b/config/v3_2/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/systemd.go b/config/v3_2/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_2/types/systemd.go -+++ b/config/v3_2/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/systemd_test.go b/config/v3_2/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_2/types/systemd_test.go -+++ b/config/v3_2/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_2/types/tang.go b/config/v3_2/types/tang.go -index 86ab79c9..a2fd8ee6 100644 ---- a/config/v3_2/types/tang.go -+++ b/config/v3_2/types/tang.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/unit.go b/config/v3_2/types/unit.go -index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_2/types/unit.go -+++ b/config/v3_2/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/unit_test.go b/config/v3_2/types/unit_test.go -index 3dc90540..8c96dfba 100644 ---- a/config/v3_2/types/unit_test.go -+++ b/config/v3_2/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/url.go b/config/v3_2/types/url.go -index 0d8771bf..bf1f3a5e 100644 ---- a/config/v3_2/types/url.go -+++ b/config/v3_2/types/url.go -@@ -19,8 +19,8 @@ import ( - - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_2/types/url_test.go b/config/v3_2/types/url_test.go -index bfef261f..b10533d9 100644 ---- a/config/v3_2/types/url_test.go -+++ b/config/v3_2/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_2/types/verification.go b/config/v3_2/types/verification.go -index 5def6f04..1ef291c0 100644 ---- a/config/v3_2/types/verification.go -+++ b/config/v3_2/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_2/types/verification_test.go b/config/v3_2/types/verification_test.go -index 9a0914d0..f121b503 100644 ---- a/config/v3_2/types/verification_test.go -+++ b/config/v3_2/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/config.go b/config/v3_3/config.go -index 446ea67d..a0a74723 100644 ---- a/config/v3_3/config.go -+++ b/config/v3_3/config.go -@@ -15,13 +15,13 @@ - package v3_3 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_2" -- "github.com/coreos/ignition/v2/config/v3_3/translate" -- "github.com/coreos/ignition/v2/config/v3_3/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_2" -+ "github.com/flatcar/ignition/v2/config/v3_3/translate" -+ "github.com/flatcar/ignition/v2/config/v3_3/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/config_test.go b/config/v3_3/config_test.go -index deb1e3b7..983c5a44 100644 ---- a/config/v3_3/config_test.go -+++ b/config/v3_3/config_test.go -@@ -17,8 +17,8 @@ package v3_3 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_3/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_3/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_3/translate/translate.go b/config/v3_3/translate/translate.go -index 656ad0a4..8d61318b 100644 ---- a/config/v3_3/translate/translate.go -+++ b/config/v3_3/translate/translate.go -@@ -15,10 +15,10 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- "github.com/coreos/ignition/v2/config/util" -- old_types "github.com/coreos/ignition/v2/config/v3_2/types" -- "github.com/coreos/ignition/v2/config/v3_3/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ "github.com/flatcar/ignition/v2/config/util" -+ old_types "github.com/flatcar/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/v3_3/types" - ) - - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { -diff --git a/config/v3_3/translate/translate_test.go b/config/v3_3/translate/translate_test.go -index 81f3029b..89c7c765 100644 ---- a/config/v3_3/translate/translate_test.go -+++ b/config/v3_3/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_2/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_2/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_3/types/clevis.go b/config/v3_3/types/clevis.go -index 68887d43..564154f6 100644 ---- a/config/v3_3/types/clevis.go -+++ b/config/v3_3/types/clevis.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/clevis_test.go b/config/v3_3/types/clevis_test.go -index f616868c..c28509ee 100644 ---- a/config/v3_3/types/clevis_test.go -+++ b/config/v3_3/types/clevis_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/config.go b/config/v3_3/types/config.go -index 9158e7f0..c2f6a8b4 100644 ---- a/config/v3_3/types/config.go -+++ b/config/v3_3/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_3/types/config_test.go b/config/v3_3/types/config_test.go -index 3d82627b..511c5ecd 100644 ---- a/config/v3_3/types/config_test.go -+++ b/config/v3_3/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/disk.go b/config/v3_3/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_3/types/disk.go -+++ b/config/v3_3/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/file.go b/config/v3_3/types/file.go -index 4e7566bd..f86d520b 100644 ---- a/config/v3_3/types/file.go -+++ b/config/v3_3/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/file_test.go b/config/v3_3/types/file_test.go -index 449e0700..5aa2e87c 100644 ---- a/config/v3_3/types/file_test.go -+++ b/config/v3_3/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_3/types/filesystem.go b/config/v3_3/types/filesystem.go -index c722b363..9f7f8bbc 100644 ---- a/config/v3_3/types/filesystem.go -+++ b/config/v3_3/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/filesystem_test.go b/config/v3_3/types/filesystem_test.go -index 1f8db903..6e710426 100644 ---- a/config/v3_3/types/filesystem_test.go -+++ b/config/v3_3/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_3/types/headers.go b/config/v3_3/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_3/types/headers.go -+++ b/config/v3_3/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_3/types/headers_test.go b/config/v3_3/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_3/types/headers_test.go -+++ b/config/v3_3/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_3/types/ignition.go b/config/v3_3/types/ignition.go -index 190445bd..1fbcf8c4 100644 ---- a/config/v3_3/types/ignition.go -+++ b/config/v3_3/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/kargs_test.go b/config/v3_3/types/kargs_test.go -index 1a258727..a79c037a 100644 ---- a/config/v3_3/types/kargs_test.go -+++ b/config/v3_3/types/kargs_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/validate" - ) - - func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_3/types/luks.go b/config/v3_3/types/luks.go -index 90d72387..2862ebae 100644 ---- a/config/v3_3/types/luks.go -+++ b/config/v3_3/types/luks.go -@@ -17,8 +17,8 @@ package types - import ( - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/mode.go b/config/v3_3/types/mode.go -index ad3e51c2..8f15a8cb 100644 ---- a/config/v3_3/types/mode.go -+++ b/config/v3_3/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_3/types/mode_test.go b/config/v3_3/types/mode_test.go -index 53e37a6b..a8fa7a81 100644 ---- a/config/v3_3/types/mode_test.go -+++ b/config/v3_3/types/mode_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_3/types/node.go b/config/v3_3/types/node.go -index 248276e7..f4e94f9e 100644 ---- a/config/v3_3/types/node.go -+++ b/config/v3_3/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/node_test.go b/config/v3_3/types/node_test.go -index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_3/types/node_test.go -+++ b/config/v3_3/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/partition.go b/config/v3_3/types/partition.go -index 1b2d97ed..6603af3b 100644 ---- a/config/v3_3/types/partition.go -+++ b/config/v3_3/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/partition_test.go b/config/v3_3/types/partition_test.go -index a1e1623f..9f8e7997 100644 ---- a/config/v3_3/types/partition_test.go -+++ b/config/v3_3/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_3/types/path.go b/config/v3_3/types/path.go -index 131e300c..cb48e341 100644 ---- a/config/v3_3/types/path.go -+++ b/config/v3_3/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_3/types/path_test.go b/config/v3_3/types/path_test.go -index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_3/types/path_test.go -+++ b/config/v3_3/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_3/types/proxy.go b/config/v3_3/types/proxy.go -index d48d210a..de146a99 100644 ---- a/config/v3_3/types/proxy.go -+++ b/config/v3_3/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/proxy_test.go b/config/v3_3/types/proxy_test.go -index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_3/types/proxy_test.go -+++ b/config/v3_3/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/raid.go b/config/v3_3/types/raid.go -index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_3/types/raid.go -+++ b/config/v3_3/types/raid.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/raid_test.go b/config/v3_3/types/raid_test.go -index 7323b26f..313b4572 100644 ---- a/config/v3_3/types/raid_test.go -+++ b/config/v3_3/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/resource.go b/config/v3_3/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_3/types/resource.go -+++ b/config/v3_3/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/storage.go b/config/v3_3/types/storage.go -index 20cb7304..552749e6 100644 ---- a/config/v3_3/types/storage.go -+++ b/config/v3_3/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/storage_test.go b/config/v3_3/types/storage_test.go -index 551688a2..6c35ed27 100644 ---- a/config/v3_3/types/storage_test.go -+++ b/config/v3_3/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/systemd.go b/config/v3_3/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_3/types/systemd.go -+++ b/config/v3_3/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/systemd_test.go b/config/v3_3/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_3/types/systemd_test.go -+++ b/config/v3_3/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_3/types/tang.go b/config/v3_3/types/tang.go -index 86ab79c9..a2fd8ee6 100644 ---- a/config/v3_3/types/tang.go -+++ b/config/v3_3/types/tang.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/unit.go b/config/v3_3/types/unit.go -index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_3/types/unit.go -+++ b/config/v3_3/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/unit_test.go b/config/v3_3/types/unit_test.go -index 3dc90540..8c96dfba 100644 ---- a/config/v3_3/types/unit_test.go -+++ b/config/v3_3/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/url.go b/config/v3_3/types/url.go -index 0d8771bf..bf1f3a5e 100644 ---- a/config/v3_3/types/url.go -+++ b/config/v3_3/types/url.go -@@ -19,8 +19,8 @@ import ( - - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_3/types/url_test.go b/config/v3_3/types/url_test.go -index bfef261f..b10533d9 100644 ---- a/config/v3_3/types/url_test.go -+++ b/config/v3_3/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_3/types/verification.go b/config/v3_3/types/verification.go -index 5def6f04..1ef291c0 100644 ---- a/config/v3_3/types/verification.go -+++ b/config/v3_3/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_3/types/verification_test.go b/config/v3_3/types/verification_test.go -index 9a0914d0..f121b503 100644 ---- a/config/v3_3/types/verification_test.go -+++ b/config/v3_3/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/config.go b/config/v3_4/config.go -index e83abb0b..0a01a560 100644 ---- a/config/v3_4/config.go -+++ b/config/v3_4/config.go -@@ -15,13 +15,13 @@ - package v3_4 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_3" -- "github.com/coreos/ignition/v2/config/v3_4/translate" -- "github.com/coreos/ignition/v2/config/v3_4/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_3" -+ "github.com/flatcar/ignition/v2/config/v3_4/translate" -+ "github.com/flatcar/ignition/v2/config/v3_4/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/config_test.go b/config/v3_4/config_test.go -index 0ee908d7..6ecb4b44 100644 ---- a/config/v3_4/config_test.go -+++ b/config/v3_4/config_test.go -@@ -17,8 +17,8 @@ package v3_4 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_4/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_4/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_4/translate/translate.go b/config/v3_4/translate/translate.go -index 5f6a23b8..fa0e27ab 100644 ---- a/config/v3_4/translate/translate.go -+++ b/config/v3_4/translate/translate.go -@@ -15,9 +15,9 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- old_types "github.com/coreos/ignition/v2/config/v3_3/types" -- "github.com/coreos/ignition/v2/config/v3_4/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ old_types "github.com/flatcar/ignition/v2/config/v3_3/types" -+ "github.com/flatcar/ignition/v2/config/v3_4/types" - ) - - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { -diff --git a/config/v3_4/translate/translate_test.go b/config/v3_4/translate/translate_test.go -index 8ff8c05c..8d0e5759 100644 ---- a/config/v3_4/translate/translate_test.go -+++ b/config/v3_4/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_3/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_3/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_4/types/clevis.go b/config/v3_4/types/clevis.go -index 68887d43..564154f6 100644 ---- a/config/v3_4/types/clevis.go -+++ b/config/v3_4/types/clevis.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/clevis_test.go b/config/v3_4/types/clevis_test.go -index f616868c..c28509ee 100644 ---- a/config/v3_4/types/clevis_test.go -+++ b/config/v3_4/types/clevis_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/config.go b/config/v3_4/types/config.go -index 4f51f3c6..daffb4fe 100644 ---- a/config/v3_4/types/config.go -+++ b/config/v3_4/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_4/types/config_test.go b/config/v3_4/types/config_test.go -index 3d82627b..511c5ecd 100644 ---- a/config/v3_4/types/config_test.go -+++ b/config/v3_4/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/disk.go b/config/v3_4/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_4/types/disk.go -+++ b/config/v3_4/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/file.go b/config/v3_4/types/file.go -index 4e7566bd..f86d520b 100644 ---- a/config/v3_4/types/file.go -+++ b/config/v3_4/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/file_test.go b/config/v3_4/types/file_test.go -index 449e0700..5aa2e87c 100644 ---- a/config/v3_4/types/file_test.go -+++ b/config/v3_4/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_4/types/filesystem.go b/config/v3_4/types/filesystem.go -index c722b363..9f7f8bbc 100644 ---- a/config/v3_4/types/filesystem.go -+++ b/config/v3_4/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/filesystem_test.go b/config/v3_4/types/filesystem_test.go -index 1f8db903..6e710426 100644 ---- a/config/v3_4/types/filesystem_test.go -+++ b/config/v3_4/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_4/types/headers.go b/config/v3_4/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_4/types/headers.go -+++ b/config/v3_4/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_4/types/headers_test.go b/config/v3_4/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_4/types/headers_test.go -+++ b/config/v3_4/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_4/types/ignition.go b/config/v3_4/types/ignition.go -index 190445bd..1fbcf8c4 100644 ---- a/config/v3_4/types/ignition.go -+++ b/config/v3_4/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/kargs_test.go b/config/v3_4/types/kargs_test.go -index 1a258727..a79c037a 100644 ---- a/config/v3_4/types/kargs_test.go -+++ b/config/v3_4/types/kargs_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/validate" - ) - - func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_4/types/luks.go b/config/v3_4/types/luks.go -index 90d72387..2862ebae 100644 ---- a/config/v3_4/types/luks.go -+++ b/config/v3_4/types/luks.go -@@ -17,8 +17,8 @@ package types - import ( - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/mode.go b/config/v3_4/types/mode.go -index ad3e51c2..8f15a8cb 100644 ---- a/config/v3_4/types/mode.go -+++ b/config/v3_4/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_4/types/mode_test.go b/config/v3_4/types/mode_test.go -index 8df91455..1c2e9404 100644 ---- a/config/v3_4/types/mode_test.go -+++ b/config/v3_4/types/mode_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_4/types/node.go b/config/v3_4/types/node.go -index 248276e7..f4e94f9e 100644 ---- a/config/v3_4/types/node.go -+++ b/config/v3_4/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/node_test.go b/config/v3_4/types/node_test.go -index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_4/types/node_test.go -+++ b/config/v3_4/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/partition.go b/config/v3_4/types/partition.go -index 1b2d97ed..6603af3b 100644 ---- a/config/v3_4/types/partition.go -+++ b/config/v3_4/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/partition_test.go b/config/v3_4/types/partition_test.go -index a1e1623f..9f8e7997 100644 ---- a/config/v3_4/types/partition_test.go -+++ b/config/v3_4/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_4/types/path.go b/config/v3_4/types/path.go -index 131e300c..cb48e341 100644 ---- a/config/v3_4/types/path.go -+++ b/config/v3_4/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_4/types/path_test.go b/config/v3_4/types/path_test.go -index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_4/types/path_test.go -+++ b/config/v3_4/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_4/types/proxy.go b/config/v3_4/types/proxy.go -index d48d210a..de146a99 100644 ---- a/config/v3_4/types/proxy.go -+++ b/config/v3_4/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/proxy_test.go b/config/v3_4/types/proxy_test.go -index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_4/types/proxy_test.go -+++ b/config/v3_4/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/raid.go b/config/v3_4/types/raid.go -index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_4/types/raid.go -+++ b/config/v3_4/types/raid.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/raid_test.go b/config/v3_4/types/raid_test.go -index 7323b26f..313b4572 100644 ---- a/config/v3_4/types/raid_test.go -+++ b/config/v3_4/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/resource.go b/config/v3_4/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_4/types/resource.go -+++ b/config/v3_4/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/storage.go b/config/v3_4/types/storage.go -index 20cb7304..552749e6 100644 ---- a/config/v3_4/types/storage.go -+++ b/config/v3_4/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/storage_test.go b/config/v3_4/types/storage_test.go -index 551688a2..6c35ed27 100644 ---- a/config/v3_4/types/storage_test.go -+++ b/config/v3_4/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/systemd.go b/config/v3_4/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_4/types/systemd.go -+++ b/config/v3_4/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/systemd_test.go b/config/v3_4/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_4/types/systemd_test.go -+++ b/config/v3_4/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_4/types/tang.go b/config/v3_4/types/tang.go -index 1839d6cc..26c155e5 100644 ---- a/config/v3_4/types/tang.go -+++ b/config/v3_4/types/tang.go -@@ -18,8 +18,8 @@ import ( - "encoding/json" - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/tang_test.go b/config/v3_4/types/tang_test.go -index fb57b1e4..ed65a712 100644 ---- a/config/v3_4/types/tang_test.go -+++ b/config/v3_4/types/tang_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_4/types/unit.go b/config/v3_4/types/unit.go -index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_4/types/unit.go -+++ b/config/v3_4/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/unit_test.go b/config/v3_4/types/unit_test.go -index 3dc90540..8c96dfba 100644 ---- a/config/v3_4/types/unit_test.go -+++ b/config/v3_4/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/url.go b/config/v3_4/types/url.go -index 97a4c9ae..b1f96337 100644 ---- a/config/v3_4/types/url.go -+++ b/config/v3_4/types/url.go -@@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go-v2/aws/arn" - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_4/types/url_test.go b/config/v3_4/types/url_test.go -index 1901b7af..12a4cfbf 100644 ---- a/config/v3_4/types/url_test.go -+++ b/config/v3_4/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_4/types/verification.go b/config/v3_4/types/verification.go -index 5def6f04..1ef291c0 100644 ---- a/config/v3_4/types/verification.go -+++ b/config/v3_4/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_4/types/verification_test.go b/config/v3_4/types/verification_test.go -index 9a0914d0..f121b503 100644 ---- a/config/v3_4/types/verification_test.go -+++ b/config/v3_4/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/config.go b/config/v3_5/config.go -index d6f8645b..f6724ea4 100644 ---- a/config/v3_5/config.go -+++ b/config/v3_5/config.go -@@ -15,13 +15,13 @@ - package v3_5 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_4" -- "github.com/coreos/ignition/v2/config/v3_5/translate" -- "github.com/coreos/ignition/v2/config/v3_5/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_4" -+ "github.com/flatcar/ignition/v2/config/v3_5/translate" -+ "github.com/flatcar/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/config_test.go b/config/v3_5/config_test.go -index 9786befc..425eb544 100644 ---- a/config/v3_5/config_test.go -+++ b/config/v3_5/config_test.go -@@ -17,8 +17,8 @@ package v3_5 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_5/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_5/translate/translate.go b/config/v3_5/translate/translate.go -index bc13973f..e0356672 100644 ---- a/config/v3_5/translate/translate.go -+++ b/config/v3_5/translate/translate.go -@@ -15,9 +15,9 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- old_types "github.com/coreos/ignition/v2/config/v3_4/types" -- "github.com/coreos/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ old_types "github.com/flatcar/ignition/v2/config/v3_4/types" -+ "github.com/flatcar/ignition/v2/config/v3_5/types" - ) - - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { -diff --git a/config/v3_5/translate/translate_test.go b/config/v3_5/translate/translate_test.go -index 7896facc..c6afaa31 100644 ---- a/config/v3_5/translate/translate_test.go -+++ b/config/v3_5/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_4/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_4/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_5/types/cex.go b/config/v3_5/types/cex.go -index b34f5f52..6f58b373 100644 ---- a/config/v3_5/types/cex.go -+++ b/config/v3_5/types/cex.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/cex_test.go b/config/v3_5/types/cex_test.go -index 35d562d8..e856a93f 100644 ---- a/config/v3_5/types/cex_test.go -+++ b/config/v3_5/types/cex_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/clevis.go b/config/v3_5/types/clevis.go -index 68887d43..564154f6 100644 ---- a/config/v3_5/types/clevis.go -+++ b/config/v3_5/types/clevis.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/clevis_test.go b/config/v3_5/types/clevis_test.go -index f616868c..c28509ee 100644 ---- a/config/v3_5/types/clevis_test.go -+++ b/config/v3_5/types/clevis_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/config.go b/config/v3_5/types/config.go -index 659657b6..61385f53 100644 ---- a/config/v3_5/types/config.go -+++ b/config/v3_5/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_5/types/config_test.go b/config/v3_5/types/config_test.go -index 3d82627b..511c5ecd 100644 ---- a/config/v3_5/types/config_test.go -+++ b/config/v3_5/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/disk.go b/config/v3_5/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_5/types/disk.go -+++ b/config/v3_5/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/file.go b/config/v3_5/types/file.go -index 4e7566bd..f86d520b 100644 ---- a/config/v3_5/types/file.go -+++ b/config/v3_5/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/file_test.go b/config/v3_5/types/file_test.go -index 449e0700..5aa2e87c 100644 ---- a/config/v3_5/types/file_test.go -+++ b/config/v3_5/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_5/types/filesystem.go b/config/v3_5/types/filesystem.go -index c722b363..9f7f8bbc 100644 ---- a/config/v3_5/types/filesystem.go -+++ b/config/v3_5/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/filesystem_test.go b/config/v3_5/types/filesystem_test.go -index 1f8db903..6e710426 100644 ---- a/config/v3_5/types/filesystem_test.go -+++ b/config/v3_5/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_5/types/headers.go b/config/v3_5/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_5/types/headers.go -+++ b/config/v3_5/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_5/types/headers_test.go b/config/v3_5/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_5/types/headers_test.go -+++ b/config/v3_5/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_5/types/ignition.go b/config/v3_5/types/ignition.go -index 190445bd..1fbcf8c4 100644 ---- a/config/v3_5/types/ignition.go -+++ b/config/v3_5/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/kargs_test.go b/config/v3_5/types/kargs_test.go -index 1a258727..a79c037a 100644 ---- a/config/v3_5/types/kargs_test.go -+++ b/config/v3_5/types/kargs_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/validate" - ) - - func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_5/types/luks.go b/config/v3_5/types/luks.go -index e4c1d681..ce9d087f 100644 ---- a/config/v3_5/types/luks.go -+++ b/config/v3_5/types/luks.go -@@ -17,8 +17,8 @@ package types - import ( - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/mode.go b/config/v3_5/types/mode.go -index ad3e51c2..8f15a8cb 100644 ---- a/config/v3_5/types/mode.go -+++ b/config/v3_5/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_5/types/mode_test.go b/config/v3_5/types/mode_test.go -index 8df91455..1c2e9404 100644 ---- a/config/v3_5/types/mode_test.go -+++ b/config/v3_5/types/mode_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_5/types/node.go b/config/v3_5/types/node.go -index 248276e7..f4e94f9e 100644 ---- a/config/v3_5/types/node.go -+++ b/config/v3_5/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/node_test.go b/config/v3_5/types/node_test.go -index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_5/types/node_test.go -+++ b/config/v3_5/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/partition.go b/config/v3_5/types/partition.go -index 1b2d97ed..6603af3b 100644 ---- a/config/v3_5/types/partition.go -+++ b/config/v3_5/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/partition_test.go b/config/v3_5/types/partition_test.go -index a1e1623f..9f8e7997 100644 ---- a/config/v3_5/types/partition_test.go -+++ b/config/v3_5/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_5/types/path.go b/config/v3_5/types/path.go -index 131e300c..cb48e341 100644 ---- a/config/v3_5/types/path.go -+++ b/config/v3_5/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_5/types/path_test.go b/config/v3_5/types/path_test.go -index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_5/types/path_test.go -+++ b/config/v3_5/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_5/types/proxy.go b/config/v3_5/types/proxy.go -index d48d210a..de146a99 100644 ---- a/config/v3_5/types/proxy.go -+++ b/config/v3_5/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/proxy_test.go b/config/v3_5/types/proxy_test.go -index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_5/types/proxy_test.go -+++ b/config/v3_5/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/raid.go b/config/v3_5/types/raid.go -index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_5/types/raid.go -+++ b/config/v3_5/types/raid.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/raid_test.go b/config/v3_5/types/raid_test.go -index 7323b26f..313b4572 100644 ---- a/config/v3_5/types/raid_test.go -+++ b/config/v3_5/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/resource.go b/config/v3_5/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_5/types/resource.go -+++ b/config/v3_5/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/storage.go b/config/v3_5/types/storage.go -index 20cb7304..552749e6 100644 ---- a/config/v3_5/types/storage.go -+++ b/config/v3_5/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/storage_test.go b/config/v3_5/types/storage_test.go -index 551688a2..6c35ed27 100644 ---- a/config/v3_5/types/storage_test.go -+++ b/config/v3_5/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/systemd.go b/config/v3_5/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_5/types/systemd.go -+++ b/config/v3_5/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/systemd_test.go b/config/v3_5/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_5/types/systemd_test.go -+++ b/config/v3_5/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_5/types/tang.go b/config/v3_5/types/tang.go -index 1839d6cc..26c155e5 100644 ---- a/config/v3_5/types/tang.go -+++ b/config/v3_5/types/tang.go -@@ -18,8 +18,8 @@ import ( - "encoding/json" - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/tang_test.go b/config/v3_5/types/tang_test.go -index fb57b1e4..ed65a712 100644 ---- a/config/v3_5/types/tang_test.go -+++ b/config/v3_5/types/tang_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_5/types/unit.go b/config/v3_5/types/unit.go -index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_5/types/unit.go -+++ b/config/v3_5/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/unit_test.go b/config/v3_5/types/unit_test.go -index 3dc90540..8c96dfba 100644 ---- a/config/v3_5/types/unit_test.go -+++ b/config/v3_5/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/url.go b/config/v3_5/types/url.go -index 97a4c9ae..b1f96337 100644 ---- a/config/v3_5/types/url.go -+++ b/config/v3_5/types/url.go -@@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go-v2/aws/arn" - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_5/types/url_test.go b/config/v3_5/types/url_test.go -index 1901b7af..12a4cfbf 100644 ---- a/config/v3_5/types/url_test.go -+++ b/config/v3_5/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_5/types/verification.go b/config/v3_5/types/verification.go -index 5def6f04..1ef291c0 100644 ---- a/config/v3_5/types/verification.go -+++ b/config/v3_5/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_5/types/verification_test.go b/config/v3_5/types/verification_test.go -index 9a0914d0..f121b503 100644 ---- a/config/v3_5/types/verification_test.go -+++ b/config/v3_5/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/config.go b/config/v3_6/config.go -index 3d4b1d7f..6a56c29a 100644 ---- a/config/v3_6/config.go -+++ b/config/v3_6/config.go -@@ -15,13 +15,13 @@ - package v3_6 - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_5" -- "github.com/coreos/ignition/v2/config/v3_6/translate" -- "github.com/coreos/ignition/v2/config/v3_6/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_5" -+ "github.com/flatcar/ignition/v2/config/v3_6/translate" -+ "github.com/flatcar/ignition/v2/config/v3_6/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/config_test.go b/config/v3_6/config_test.go -index fe61553f..7ba97987 100644 ---- a/config/v3_6/config_test.go -+++ b/config/v3_6/config_test.go -@@ -17,8 +17,8 @@ package v3_6 - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_6/translate/translate.go b/config/v3_6/translate/translate.go -index ae16eef3..3974aa50 100644 ---- a/config/v3_6/translate/translate.go -+++ b/config/v3_6/translate/translate.go -@@ -15,10 +15,10 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- "github.com/coreos/ignition/v2/config/util" -- old_types "github.com/coreos/ignition/v2/config/v3_5/types" -- "github.com/coreos/ignition/v2/config/v3_6/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ "github.com/flatcar/ignition/v2/config/util" -+ old_types "github.com/flatcar/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/v3_6/types" - ) - - func translateFileEmbedded1(old old_types.FileEmbedded1) (ret types.FileEmbedded1) { -diff --git a/config/v3_6/translate/translate_test.go b/config/v3_6/translate/translate_test.go -index fc9e3de5..cc041bdc 100644 ---- a/config/v3_6/translate/translate_test.go -+++ b/config/v3_6/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_5/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_6/types/cex.go b/config/v3_6/types/cex.go -index b34f5f52..6f58b373 100644 ---- a/config/v3_6/types/cex.go -+++ b/config/v3_6/types/cex.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/cex_test.go b/config/v3_6/types/cex_test.go -index 35d562d8..e856a93f 100644 ---- a/config/v3_6/types/cex_test.go -+++ b/config/v3_6/types/cex_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/clevis.go b/config/v3_6/types/clevis.go -index 3742633d..403603a9 100644 ---- a/config/v3_6/types/clevis.go -+++ b/config/v3_6/types/clevis.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/clevis_test.go b/config/v3_6/types/clevis_test.go -index 81fb3b26..ce35bac9 100644 ---- a/config/v3_6/types/clevis_test.go -+++ b/config/v3_6/types/clevis_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/config.go b/config/v3_6/types/config.go -index 02ef7b4a..97a3b66a 100644 ---- a/config/v3_6/types/config.go -+++ b/config/v3_6/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_6/types/config_test.go b/config/v3_6/types/config_test.go -index 3d82627b..511c5ecd 100644 ---- a/config/v3_6/types/config_test.go -+++ b/config/v3_6/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/disk.go b/config/v3_6/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_6/types/disk.go -+++ b/config/v3_6/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/file.go b/config/v3_6/types/file.go -index 9b71bb26..e3f7fbdf 100644 ---- a/config/v3_6/types/file.go -+++ b/config/v3_6/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/file_test.go b/config/v3_6/types/file_test.go -index 449e0700..5aa2e87c 100644 ---- a/config/v3_6/types/file_test.go -+++ b/config/v3_6/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_6/types/filesystem.go b/config/v3_6/types/filesystem.go -index c722b363..9f7f8bbc 100644 ---- a/config/v3_6/types/filesystem.go -+++ b/config/v3_6/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/filesystem_test.go b/config/v3_6/types/filesystem_test.go -index 1f8db903..6e710426 100644 ---- a/config/v3_6/types/filesystem_test.go -+++ b/config/v3_6/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_6/types/headers.go b/config/v3_6/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_6/types/headers.go -+++ b/config/v3_6/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_6/types/headers_test.go b/config/v3_6/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_6/types/headers_test.go -+++ b/config/v3_6/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_6/types/ignition.go b/config/v3_6/types/ignition.go -index 190445bd..1fbcf8c4 100644 ---- a/config/v3_6/types/ignition.go -+++ b/config/v3_6/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/kargs_test.go b/config/v3_6/types/kargs_test.go -index 1a258727..a79c037a 100644 ---- a/config/v3_6/types/kargs_test.go -+++ b/config/v3_6/types/kargs_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/validate" - ) - - func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_6/types/luks.go b/config/v3_6/types/luks.go -index e4c1d681..ce9d087f 100644 ---- a/config/v3_6/types/luks.go -+++ b/config/v3_6/types/luks.go -@@ -17,8 +17,8 @@ package types - import ( - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/mode.go b/config/v3_6/types/mode.go -index 9eb7573d..67c7ebd3 100644 ---- a/config/v3_6/types/mode.go -+++ b/config/v3_6/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_6/types/mode_test.go b/config/v3_6/types/mode_test.go -index 8966e25d..5c973dbf 100644 ---- a/config/v3_6/types/mode_test.go -+++ b/config/v3_6/types/mode_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestModeValidate(t *testing.T) { -diff --git a/config/v3_6/types/node.go b/config/v3_6/types/node.go -index 248276e7..f4e94f9e 100644 ---- a/config/v3_6/types/node.go -+++ b/config/v3_6/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/node_test.go b/config/v3_6/types/node_test.go -index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_6/types/node_test.go -+++ b/config/v3_6/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/partition.go b/config/v3_6/types/partition.go -index 1b2d97ed..6603af3b 100644 ---- a/config/v3_6/types/partition.go -+++ b/config/v3_6/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/partition_test.go b/config/v3_6/types/partition_test.go -index a1e1623f..9f8e7997 100644 ---- a/config/v3_6/types/partition_test.go -+++ b/config/v3_6/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_6/types/path.go b/config/v3_6/types/path.go -index 131e300c..cb48e341 100644 ---- a/config/v3_6/types/path.go -+++ b/config/v3_6/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_6/types/path_test.go b/config/v3_6/types/path_test.go -index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_6/types/path_test.go -+++ b/config/v3_6/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_6/types/proxy.go b/config/v3_6/types/proxy.go -index d48d210a..de146a99 100644 ---- a/config/v3_6/types/proxy.go -+++ b/config/v3_6/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/proxy_test.go b/config/v3_6/types/proxy_test.go -index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_6/types/proxy_test.go -+++ b/config/v3_6/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/raid.go b/config/v3_6/types/raid.go -index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_6/types/raid.go -+++ b/config/v3_6/types/raid.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/raid_test.go b/config/v3_6/types/raid_test.go -index 7323b26f..313b4572 100644 ---- a/config/v3_6/types/raid_test.go -+++ b/config/v3_6/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/resource.go b/config/v3_6/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_6/types/resource.go -+++ b/config/v3_6/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/storage.go b/config/v3_6/types/storage.go -index 20cb7304..552749e6 100644 ---- a/config/v3_6/types/storage.go -+++ b/config/v3_6/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/storage_test.go b/config/v3_6/types/storage_test.go -index 551688a2..6c35ed27 100644 ---- a/config/v3_6/types/storage_test.go -+++ b/config/v3_6/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/systemd.go b/config/v3_6/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_6/types/systemd.go -+++ b/config/v3_6/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/systemd_test.go b/config/v3_6/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_6/types/systemd_test.go -+++ b/config/v3_6/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_6/types/tang.go b/config/v3_6/types/tang.go -index 1839d6cc..26c155e5 100644 ---- a/config/v3_6/types/tang.go -+++ b/config/v3_6/types/tang.go -@@ -18,8 +18,8 @@ import ( - "encoding/json" - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/tang_test.go b/config/v3_6/types/tang_test.go -index fb57b1e4..ed65a712 100644 ---- a/config/v3_6/types/tang_test.go -+++ b/config/v3_6/types/tang_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_6/types/unit.go b/config/v3_6/types/unit.go -index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_6/types/unit.go -+++ b/config/v3_6/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/unit_test.go b/config/v3_6/types/unit_test.go -index 3dc90540..8c96dfba 100644 ---- a/config/v3_6/types/unit_test.go -+++ b/config/v3_6/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/url.go b/config/v3_6/types/url.go -index 97a4c9ae..b1f96337 100644 ---- a/config/v3_6/types/url.go -+++ b/config/v3_6/types/url.go -@@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go-v2/aws/arn" - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_6/types/url_test.go b/config/v3_6/types/url_test.go -index 1901b7af..12a4cfbf 100644 ---- a/config/v3_6/types/url_test.go -+++ b/config/v3_6/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_6/types/verification.go b/config/v3_6/types/verification.go -index 5def6f04..1ef291c0 100644 ---- a/config/v3_6/types/verification.go -+++ b/config/v3_6/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_6/types/verification_test.go b/config/v3_6/types/verification_test.go -index 9a0914d0..f121b503 100644 ---- a/config/v3_6/types/verification_test.go -+++ b/config/v3_6/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/config.go b/config/v3_7_experimental/config.go -index c82ca703..8d02129e 100644 ---- a/config/v3_7_experimental/config.go -+++ b/config/v3_7_experimental/config.go -@@ -15,13 +15,13 @@ - package v3_7_experimental - - import ( -- "github.com/coreos/ignition/v2/config/merge" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -- prev "github.com/coreos/ignition/v2/config/v3_6" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/translate" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" -+ prev "github.com/flatcar/ignition/v2/config/v3_6" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/translate" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/validate" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/config_test.go b/config/v3_7_experimental/config_test.go -index d9dff3f5..beb5c6d6 100644 ---- a/config/v3_7_experimental/config_test.go -+++ b/config/v3_7_experimental/config_test.go -@@ -17,8 +17,8 @@ package v3_7_experimental - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_7_experimental/translate/translate.go b/config/v3_7_experimental/translate/translate.go -index 3946b1fe..95d6cdcd 100644 ---- a/config/v3_7_experimental/translate/translate.go -+++ b/config/v3_7_experimental/translate/translate.go -@@ -15,9 +15,9 @@ - package translate - - import ( -- "github.com/coreos/ignition/v2/config/translate" -- old_types "github.com/coreos/ignition/v2/config/v3_6/types" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ old_types "github.com/flatcar/ignition/v2/config/v3_6/types" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { -diff --git a/config/v3_7_experimental/translate/translate_test.go b/config/v3_7_experimental/translate/translate_test.go -index 043e4cbf..2e277309 100644 ---- a/config/v3_7_experimental/translate/translate_test.go -+++ b/config/v3_7_experimental/translate/translate_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- old "github.com/coreos/ignition/v2/config/v3_6/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ old "github.com/flatcar/ignition/v2/config/v3_6/types" - ) - - // Check that we have valid translators for the complete config struct -diff --git a/config/v3_7_experimental/types/cex.go b/config/v3_7_experimental/types/cex.go -index b34f5f52..6f58b373 100644 ---- a/config/v3_7_experimental/types/cex.go -+++ b/config/v3_7_experimental/types/cex.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/cex_test.go b/config/v3_7_experimental/types/cex_test.go -index 35d562d8..e856a93f 100644 ---- a/config/v3_7_experimental/types/cex_test.go -+++ b/config/v3_7_experimental/types/cex_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/clevis.go b/config/v3_7_experimental/types/clevis.go -index 3742633d..403603a9 100644 ---- a/config/v3_7_experimental/types/clevis.go -+++ b/config/v3_7_experimental/types/clevis.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/clevis_test.go b/config/v3_7_experimental/types/clevis_test.go -index 81fb3b26..ce35bac9 100644 ---- a/config/v3_7_experimental/types/clevis_test.go -+++ b/config/v3_7_experimental/types/clevis_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/config.go b/config/v3_7_experimental/types/config.go -index a3baabf0..d319bde6 100644 ---- a/config/v3_7_experimental/types/config.go -+++ b/config/v3_7_experimental/types/config.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/path" -diff --git a/config/v3_7_experimental/types/config_test.go b/config/v3_7_experimental/types/config_test.go -index 3d82627b..511c5ecd 100644 ---- a/config/v3_7_experimental/types/config_test.go -+++ b/config/v3_7_experimental/types/config_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/disk.go b/config/v3_7_experimental/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_7_experimental/types/disk.go -+++ b/config/v3_7_experimental/types/disk.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/file.go b/config/v3_7_experimental/types/file.go -index 9b71bb26..e3f7fbdf 100644 ---- a/config/v3_7_experimental/types/file.go -+++ b/config/v3_7_experimental/types/file.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/file_test.go b/config/v3_7_experimental/types/file_test.go -index 449e0700..5aa2e87c 100644 ---- a/config/v3_7_experimental/types/file_test.go -+++ b/config/v3_7_experimental/types/file_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_7_experimental/types/filesystem.go b/config/v3_7_experimental/types/filesystem.go -index c722b363..9f7f8bbc 100644 ---- a/config/v3_7_experimental/types/filesystem.go -+++ b/config/v3_7_experimental/types/filesystem.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/filesystem_test.go b/config/v3_7_experimental/types/filesystem_test.go -index 1f8db903..6e710426 100644 ---- a/config/v3_7_experimental/types/filesystem_test.go -+++ b/config/v3_7_experimental/types/filesystem_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_7_experimental/types/headers.go b/config/v3_7_experimental/types/headers.go -index be1aadad..e968a2b4 100644 ---- a/config/v3_7_experimental/types/headers.go -+++ b/config/v3_7_experimental/types/headers.go -@@ -17,7 +17,7 @@ package types - import ( - "net/http" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_7_experimental/types/headers_test.go b/config/v3_7_experimental/types/headers_test.go -index 40380b68..5e888830 100644 ---- a/config/v3_7_experimental/types/headers_test.go -+++ b/config/v3_7_experimental/types/headers_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func toPointer(val string) *string { -diff --git a/config/v3_7_experimental/types/ignition.go b/config/v3_7_experimental/types/ignition.go -index 190445bd..1fbcf8c4 100644 ---- a/config/v3_7_experimental/types/ignition.go -+++ b/config/v3_7_experimental/types/ignition.go -@@ -17,7 +17,7 @@ package types - import ( - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/kargs_test.go b/config/v3_7_experimental/types/kargs_test.go -index 1a258727..a79c037a 100644 ---- a/config/v3_7_experimental/types/kargs_test.go -+++ b/config/v3_7_experimental/types/kargs_test.go -@@ -17,7 +17,7 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar/ignition/v2/config/validate" - ) - - func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_7_experimental/types/luks.go b/config/v3_7_experimental/types/luks.go -index e4c1d681..ce9d087f 100644 ---- a/config/v3_7_experimental/types/luks.go -+++ b/config/v3_7_experimental/types/luks.go -@@ -17,8 +17,8 @@ package types - import ( - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/mode.go b/config/v3_7_experimental/types/mode.go -index 9eb7573d..67c7ebd3 100644 ---- a/config/v3_7_experimental/types/mode.go -+++ b/config/v3_7_experimental/types/mode.go -@@ -15,7 +15,7 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func validateMode(m *int) error { -diff --git a/config/v3_7_experimental/types/mode_test.go b/config/v3_7_experimental/types/mode_test.go -index 8966e25d..5c973dbf 100644 ---- a/config/v3_7_experimental/types/mode_test.go -+++ b/config/v3_7_experimental/types/mode_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestModeValidate(t *testing.T) { -diff --git a/config/v3_7_experimental/types/node.go b/config/v3_7_experimental/types/node.go -index 248276e7..f4e94f9e 100644 ---- a/config/v3_7_experimental/types/node.go -+++ b/config/v3_7_experimental/types/node.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/node_test.go b/config/v3_7_experimental/types/node_test.go -index 20ba4eb6..9176b4b7 100644 ---- a/config/v3_7_experimental/types/node_test.go -+++ b/config/v3_7_experimental/types/node_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/partition.go b/config/v3_7_experimental/types/partition.go -index 1b2d97ed..6603af3b 100644 ---- a/config/v3_7_experimental/types/partition.go -+++ b/config/v3_7_experimental/types/partition.go -@@ -19,8 +19,8 @@ import ( - "regexp" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/partition_test.go b/config/v3_7_experimental/types/partition_test.go -index a1e1623f..9f8e7997 100644 ---- a/config/v3_7_experimental/types/partition_test.go -+++ b/config/v3_7_experimental/types/partition_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_7_experimental/types/path.go b/config/v3_7_experimental/types/path.go -index 131e300c..cb48e341 100644 ---- a/config/v3_7_experimental/types/path.go -+++ b/config/v3_7_experimental/types/path.go -@@ -17,8 +17,8 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validatePath(p string) error { -diff --git a/config/v3_7_experimental/types/path_test.go b/config/v3_7_experimental/types/path_test.go -index 3d199cbd..33b2d0ba 100644 ---- a/config/v3_7_experimental/types/path_test.go -+++ b/config/v3_7_experimental/types/path_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - ) - - func TestPathValidate(t *testing.T) { -diff --git a/config/v3_7_experimental/types/proxy.go b/config/v3_7_experimental/types/proxy.go -index d48d210a..de146a99 100644 ---- a/config/v3_7_experimental/types/proxy.go -+++ b/config/v3_7_experimental/types/proxy.go -@@ -17,7 +17,7 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/proxy_test.go b/config/v3_7_experimental/types/proxy_test.go -index 269f4fb2..3cc5e5cd 100644 ---- a/config/v3_7_experimental/types/proxy_test.go -+++ b/config/v3_7_experimental/types/proxy_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/raid.go b/config/v3_7_experimental/types/raid.go -index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_7_experimental/types/raid.go -+++ b/config/v3_7_experimental/types/raid.go -@@ -15,8 +15,8 @@ - package types - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/raid_test.go b/config/v3_7_experimental/types/raid_test.go -index 7323b26f..313b4572 100644 ---- a/config/v3_7_experimental/types/raid_test.go -+++ b/config/v3_7_experimental/types/raid_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/resource.go b/config/v3_7_experimental/types/resource.go -index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_7_experimental/types/resource.go -+++ b/config/v3_7_experimental/types/resource.go -@@ -17,8 +17,8 @@ package types - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/storage.go b/config/v3_7_experimental/types/storage.go -index 20cb7304..552749e6 100644 ---- a/config/v3_7_experimental/types/storage.go -+++ b/config/v3_7_experimental/types/storage.go -@@ -18,8 +18,8 @@ import ( - "path" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/storage_test.go b/config/v3_7_experimental/types/storage_test.go -index 551688a2..6c35ed27 100644 ---- a/config/v3_7_experimental/types/storage_test.go -+++ b/config/v3_7_experimental/types/storage_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/systemd.go b/config/v3_7_experimental/types/systemd.go -index ac521ba7..818959f4 100644 ---- a/config/v3_7_experimental/types/systemd.go -+++ b/config/v3_7_experimental/types/systemd.go -@@ -17,9 +17,9 @@ package types - import ( - "regexp" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/util" - - vpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/systemd_test.go b/config/v3_7_experimental/types/systemd_test.go -index 798eb10f..b432e83b 100644 ---- a/config/v3_7_experimental/types/systemd_test.go -+++ b/config/v3_7_experimental/types/systemd_test.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - "github.com/stretchr/testify/assert" -diff --git a/config/v3_7_experimental/types/tang.go b/config/v3_7_experimental/types/tang.go -index 1839d6cc..26c155e5 100644 ---- a/config/v3_7_experimental/types/tang.go -+++ b/config/v3_7_experimental/types/tang.go -@@ -18,8 +18,8 @@ import ( - "encoding/json" - "net/url" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/tang_test.go b/config/v3_7_experimental/types/tang_test.go -index fb57b1e4..ed65a712 100644 ---- a/config/v3_7_experimental/types/tang_test.go -+++ b/config/v3_7_experimental/types/tang_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" - ) -diff --git a/config/v3_7_experimental/types/unit.go b/config/v3_7_experimental/types/unit.go -index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_7_experimental/types/unit.go -+++ b/config/v3_7_experimental/types/unit.go -@@ -17,10 +17,10 @@ package types - import ( - "path" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/shared/parse" -- "github.com/coreos/ignition/v2/config/shared/validations" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/parse" -+ "github.com/flatcar/ignition/v2/config/shared/validations" -+ "github.com/flatcar/ignition/v2/config/util" - - cpath "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/unit_test.go b/config/v3_7_experimental/types/unit_test.go -index 3dc90540..8c96dfba 100644 ---- a/config/v3_7_experimental/types/unit_test.go -+++ b/config/v3_7_experimental/types/unit_test.go -@@ -19,8 +19,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/url.go b/config/v3_7_experimental/types/url.go -index 97a4c9ae..b1f96337 100644 ---- a/config/v3_7_experimental/types/url.go -+++ b/config/v3_7_experimental/types/url.go -@@ -21,8 +21,8 @@ import ( - "github.com/aws/aws-sdk-go-v2/aws/arn" - "github.com/vincent-petithory/dataurl" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func validateURL(s string) error { -diff --git a/config/v3_7_experimental/types/url_test.go b/config/v3_7_experimental/types/url_test.go -index 1901b7af..12a4cfbf 100644 ---- a/config/v3_7_experimental/types/url_test.go -+++ b/config/v3_7_experimental/types/url_test.go -@@ -17,8 +17,8 @@ package types - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - func TestURLValidate(t *testing.T) { -diff --git a/config/v3_7_experimental/types/verification.go b/config/v3_7_experimental/types/verification.go -index 5def6f04..1ef291c0 100644 ---- a/config/v3_7_experimental/types/verification.go -+++ b/config/v3_7_experimental/types/verification.go -@@ -19,7 +19,7 @@ import ( - "encoding/hex" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/v3_7_experimental/types/verification_test.go b/config/v3_7_experimental/types/verification_test.go -index 9a0914d0..f121b503 100644 ---- a/config/v3_7_experimental/types/verification_test.go -+++ b/config/v3_7_experimental/types/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/config/validate/validate.go b/config/validate/validate.go -index 56ffcd0a..a1a55d0d 100644 ---- a/config/validate/validate.go -+++ b/config/validate/validate.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "reflect" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/util" - - "github.com/coreos/vcontext/json" - "github.com/coreos/vcontext/path" -diff --git a/config/validate/validate_test.go b/config/validate/validate_test.go -index 820a7f07..0f359f5b 100644 ---- a/config/validate/validate_test.go -+++ b/config/validate/validate_test.go -@@ -20,7 +20,7 @@ import ( - "reflect" - "testing" - -- ignerrors "github.com/coreos/ignition/v2/config/shared/errors" -+ ignerrors "github.com/flatcar/ignition/v2/config/shared/errors" - - "github.com/coreos/vcontext/path" - "github.com/coreos/vcontext/report" -diff --git a/go.mod b/go.mod -index 2822e5ad..0c090c5b 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,4 +1,4 @@ --module github.com/coreos/ignition/v2 -+module github.com/flatcar/ignition/v2 - - go 1.24.0 - -diff --git a/internal/apply/apply.go b/internal/apply/apply.go -index 1e55b937..be4f8f32 100644 ---- a/internal/apply/apply.go -+++ b/internal/apply/apply.go -@@ -20,21 +20,21 @@ import ( - "os" - "path/filepath" - -- "github.com/coreos/ignition/v2/internal/exec" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/disks" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch_offline" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/files" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/kargs" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/mount" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/umount" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -- "github.com/coreos/ignition/v2/internal/util" -- -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch_offline" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/files" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/kargs" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/mount" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/internal/util" -+ -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - type Flags struct { -diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 20190903..235882d5 100644 ---- a/internal/distro/distro.go -+++ b/internal/distro/distro.go -@@ -20,7 +20,7 @@ import ( - ) - - // Distro-specific settings that can be overridden at link time with e.g. --// -X github.com/coreos/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm -+// -X github.com/flatcar/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm - var ( - // Device node directories and paths - diskByLabelDir = "/dev/disk/by-label" -diff --git a/internal/doc/main.go b/internal/doc/main.go -index 11ad19e3..cc097f8c 100644 ---- a/internal/doc/main.go -+++ b/internal/doc/main.go -@@ -25,15 +25,15 @@ import ( - - "github.com/coreos/go-semver/semver" - -- "github.com/coreos/ignition/v2/config/doc" -- v30 "github.com/coreos/ignition/v2/config/v3_0/types" -- v31 "github.com/coreos/ignition/v2/config/v3_1/types" -- v32 "github.com/coreos/ignition/v2/config/v3_2/types" -- v33 "github.com/coreos/ignition/v2/config/v3_3/types" -- v34 "github.com/coreos/ignition/v2/config/v3_4/types" -- v35 "github.com/coreos/ignition/v2/config/v3_5/types" -- v36 "github.com/coreos/ignition/v2/config/v3_6/types" -- v37 "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/doc" -+ v30 "github.com/flatcar/ignition/v2/config/v3_0/types" -+ v31 "github.com/flatcar/ignition/v2/config/v3_1/types" -+ v32 "github.com/flatcar/ignition/v2/config/v3_2/types" -+ v33 "github.com/flatcar/ignition/v2/config/v3_3/types" -+ v34 "github.com/flatcar/ignition/v2/config/v3_4/types" -+ v35 "github.com/flatcar/ignition/v2/config/v3_5/types" -+ v36 "github.com/flatcar/ignition/v2/config/v3_6/types" -+ v37 "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - var ( -diff --git a/internal/exec/config_fetcher.go b/internal/exec/config_fetcher.go -index db25ad05..cc746a62 100644 ---- a/internal/exec/config_fetcher.go -+++ b/internal/exec/config_fetcher.go -@@ -20,15 +20,15 @@ import ( - "net/http" - "net/url" - -- "github.com/coreos/ignition/v2/config" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -- "github.com/coreos/ignition/v2/internal/util" -- -- latest "github.com/coreos/ignition/v2/config/v3_7_experimental" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/internal/util" -+ -+ latest "github.com/flatcar/ignition/v2/config/v3_7_experimental" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - type ConfigFetcher struct { -diff --git a/internal/exec/engine.go b/internal/exec/engine.go -index 7e458f4f..24861db5 100644 ---- a/internal/exec/engine.go -+++ b/internal/exec/engine.go -@@ -23,17 +23,17 @@ import ( - "time" - - "github.com/coreos/go-systemd/v22/journal" -- "github.com/coreos/ignition/v2/config/shared/errors" -- latest "github.com/coreos/ignition/v2/config/v3_7_experimental" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- executil "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/cmdline" -- "github.com/coreos/ignition/v2/internal/providers/system" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ latest "github.com/flatcar/ignition/v2/config/v3_7_experimental" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ executil "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/cmdline" -+ "github.com/flatcar/ignition/v2/internal/providers/system" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - - "github.com/coreos/vcontext/report" - "github.com/coreos/vcontext/validate" -diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go -index 858c17b5..27fdf480 100644 ---- a/internal/exec/stages/disks/disks.go -+++ b/internal/exec/stages/disks/disks.go -@@ -25,14 +25,14 @@ import ( - "os/exec" - "path/filepath" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -- "github.com/coreos/ignition/v2/internal/systemd" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/internal/systemd" - ) - - const ( -diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index cfee68d6..28a931d6 100644 ---- a/internal/exec/stages/disks/filesystems.go -+++ b/internal/exec/stages/disks/filesystems.go -@@ -25,10 +25,10 @@ import ( - "runtime" - "strings" - -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/util" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/util" - ) - - var ( -diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go -index 72fde098..9114e25a 100644 ---- a/internal/exec/stages/disks/luks.go -+++ b/internal/exec/stages/disks/luks.go -@@ -29,12 +29,12 @@ import ( - "strconv" - "strings" - -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- execUtil "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ execUtil "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/vincent-petithory/dataurl" - ) -diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index 9a7ae9ca..c20e4875 100644 ---- a/internal/exec/stages/disks/partitions.go -+++ b/internal/exec/stages/disks/partitions.go -@@ -30,12 +30,12 @@ import ( - "strconv" - "strings" - -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/sgdisk" -- iutil "github.com/coreos/ignition/v2/internal/util" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/sgdisk" -+ iutil "github.com/flatcar/ignition/v2/internal/util" - ) - - var ( -diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go -index f209efaa..d75dceaa 100644 ---- a/internal/exec/stages/disks/raid.go -+++ b/internal/exec/stages/disks/raid.go -@@ -24,9 +24,9 @@ import ( - "os/exec" - "strings" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/util" - ) - - func (s stage) createRaids(config types.Config) error { -diff --git a/internal/exec/stages/fetch/fetch.go b/internal/exec/stages/fetch/fetch.go -index 0d03c987..511d26d6 100644 ---- a/internal/exec/stages/fetch/fetch.go -+++ b/internal/exec/stages/fetch/fetch.go -@@ -19,12 +19,12 @@ - package fetch - - import ( -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - ) - - const ( -diff --git a/internal/exec/stages/fetch_offline/fetch-offline.go b/internal/exec/stages/fetch_offline/fetch-offline.go -index 46dc146f..375b18a0 100644 ---- a/internal/exec/stages/fetch_offline/fetch-offline.go -+++ b/internal/exec/stages/fetch_offline/fetch-offline.go -@@ -22,14 +22,14 @@ import ( - "net/url" - "reflect" - -- cfgutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- executil "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -- "github.com/coreos/ignition/v2/internal/util" -+ cfgutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ executil "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/internal/util" - ) - - const ( -diff --git a/internal/exec/stages/fetch_offline/fetch_offline_test.go b/internal/exec/stages/fetch_offline/fetch_offline_test.go -index df72415b..06577083 100644 ---- a/internal/exec/stages/fetch_offline/fetch_offline_test.go -+++ b/internal/exec/stages/fetch_offline/fetch_offline_test.go -@@ -17,8 +17,8 @@ package fetch_offline - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - - "github.com/stretchr/testify/assert" - ) -diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index 13f0fe11..8d19d4e3 100644 ---- a/internal/exec/stages/files/files.go -+++ b/internal/exec/stages/files/files.go -@@ -20,13 +20,13 @@ import ( - "os" - "path/filepath" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - ) - - const ( -diff --git a/internal/exec/stages/files/files_test.go b/internal/exec/stages/files/files_test.go -index 1d9683e6..fdc870b3 100644 ---- a/internal/exec/stages/files/files_test.go -+++ b/internal/exec/stages/files/files_test.go -@@ -19,8 +19,8 @@ import ( - "sort" - "testing" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec/util" - ) - - func TestEntrySort(t *testing.T) { -diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index d01554a1..9fc40ff1 100644 ---- a/internal/exec/stages/files/filesystemEntries.go -+++ b/internal/exec/stages/files/filesystemEntries.go -@@ -24,11 +24,11 @@ import ( - "strings" - "time" - -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" - - "github.com/vincent-petithory/dataurl" - ) -@@ -459,7 +459,7 @@ func (s stage) getOrderedCreationList(config types.Config) ([]filesystemEntry, e - - // Append all the hard links to the list after sorting. This allows - // Ignition to create hard links to files that are deeper than the hard -- // link. For reference: https://github.com/coreos/ignition/issues/800 -+ // link. For reference: https://github.com/flatcar/ignition/issues/800 - entries = append(entries, hardlinks...) - - return entries, nil -diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index 737e9cce..2c3e0d11 100644 ---- a/internal/exec/stages/files/passwd.go -+++ b/internal/exec/stages/files/passwd.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "path/filepath" - -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - func (s *stage) expandGlobList(globs ...string) ([]string, error) { -diff --git a/internal/exec/stages/files/units.go b/internal/exec/stages/files/units.go -index d690f054..aefd91e7 100644 ---- a/internal/exec/stages/files/units.go -+++ b/internal/exec/stages/files/units.go -@@ -21,11 +21,11 @@ import ( - "sort" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/systemd" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/systemd" - ) - - // Preset holds the information about -@@ -45,7 +45,7 @@ func (s *stage) warnOnOldSystemdVersion() error { - return err - } - if systemdVersion < 240 { -- s.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/coreos/ignition/issues/586 for more information.", systemdVersion) -+ s.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/flatcar/ignition/issues/586 for more information.", systemdVersion) - } - return nil - } -diff --git a/internal/exec/stages/files/units_test.go b/internal/exec/stages/files/units_test.go -index e435d4c3..4acd9feb 100644 ---- a/internal/exec/stages/files/units_test.go -+++ b/internal/exec/stages/files/units_test.go -@@ -18,8 +18,8 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - func TestParseInstanceUnit(t *testing.T) { -diff --git a/internal/exec/stages/kargs/kargs.go b/internal/exec/stages/kargs/kargs.go -index d03b0aae..92d67cae 100644 ---- a/internal/exec/stages/kargs/kargs.go -+++ b/internal/exec/stages/kargs/kargs.go -@@ -19,13 +19,13 @@ import ( - "fmt" - "os/exec" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - ) - - const ( -diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index a5aa1f8b..bc0bf534 100644 ---- a/internal/exec/stages/mount/mount.go -+++ b/internal/exec/stages/mount/mount.go -@@ -27,14 +27,14 @@ import ( - "sort" - "strings" - -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - ) - - const ( -diff --git a/internal/exec/stages/stages.go b/internal/exec/stages/stages.go -index ef32b5f0..4ac38628 100644 ---- a/internal/exec/stages/stages.go -+++ b/internal/exec/stages/stages.go -@@ -15,11 +15,11 @@ - package stages - - import ( -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/registry" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/registry" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - ) - - // Stage is responsible for actually executing a stage of the configuration. -diff --git a/internal/exec/stages/umount/umount.go b/internal/exec/stages/umount/umount.go -index 9e002d5f..ec749fc7 100644 ---- a/internal/exec/stages/umount/umount.go -+++ b/internal/exec/stages/umount/umount.go -@@ -22,13 +22,13 @@ import ( - "errors" - "sort" - -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - - "golang.org/x/sys/unix" - ) -diff --git a/internal/exec/util/blkid.go b/internal/exec/util/blkid.go -index 35ebbffb..1fa6306c 100644 ---- a/internal/exec/util/blkid.go -+++ b/internal/exec/util/blkid.go -@@ -32,7 +32,7 @@ import ( - "strings" - "unsafe" - -- "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/util" - ) - - const ( -diff --git a/internal/exec/util/file.go b/internal/exec/util/file.go -index d646cf38..2c096e87 100644 ---- a/internal/exec/util/file.go -+++ b/internal/exec/util/file.go -@@ -26,11 +26,11 @@ import ( - "strconv" - "syscall" - -- cutil "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/util" -+ cutil "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/util" - - "golang.org/x/sys/unix" - ) -diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go -index 049a26dd..32cb28e3 100644 ---- a/internal/exec/util/passwd.go -+++ b/internal/exec/util/passwd.go -@@ -24,10 +24,10 @@ import ( - "strings" - - "github.com/coreos/go-systemd/v22/journal" -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/as_user" -- "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/as_user" -+ "github.com/flatcar/ignition/v2/internal/distro" - "golang.org/x/sys/unix" - ) - -diff --git a/internal/exec/util/selinux.go b/internal/exec/util/selinux.go -index 79e8f5f1..70c1cb7b 100644 ---- a/internal/exec/util/selinux.go -+++ b/internal/exec/util/selinux.go -@@ -21,7 +21,7 @@ import ( - "os/exec" - "strings" - -- "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/distro" - ) - - const ( -diff --git a/internal/exec/util/unit.go b/internal/exec/util/unit.go -index d70c3199..2a42465d 100644 ---- a/internal/exec/util/unit.go -+++ b/internal/exec/util/unit.go -@@ -22,8 +22,8 @@ import ( - "path/filepath" - "syscall" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" - - "github.com/vincent-petithory/dataurl" - ) -diff --git a/internal/exec/util/user_group_lookup_test.go b/internal/exec/util/user_group_lookup_test.go -index 9c214f29..73f147df 100644 ---- a/internal/exec/util/user_group_lookup_test.go -+++ b/internal/exec/util/user_group_lookup_test.go -@@ -20,7 +20,7 @@ import ( - "path/filepath" - "testing" - -- "github.com/coreos/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/log" - ) - - // tempBase() slaps together a minimal /etc/{passwd,group} for the lookup test. -diff --git a/internal/exec/util/util.go b/internal/exec/util/util.go -index 7e880e3b..f1865474 100644 ---- a/internal/exec/util/util.go -+++ b/internal/exec/util/util.go -@@ -18,9 +18,9 @@ import ( - "os" - "path/filepath" - -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - ) - - // Util encapsulates logging and destdir indirection for the util methods. -diff --git a/internal/main.go b/internal/main.go -index 4d636a39..20f57845 100644 ---- a/internal/main.go -+++ b/internal/main.go -@@ -22,15 +22,15 @@ import ( - "path/filepath" - "time" - -- "github.com/coreos/ignition/v2/config" -- "github.com/coreos/ignition/v2/internal/apply" -- "github.com/coreos/ignition/v2/internal/exec" -- "github.com/coreos/ignition/v2/internal/exec/stages" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- _ "github.com/coreos/ignition/v2/internal/register" -- "github.com/coreos/ignition/v2/internal/state" -- "github.com/coreos/ignition/v2/internal/version" -+ "github.com/flatcar/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/internal/apply" -+ "github.com/flatcar/ignition/v2/internal/exec" -+ "github.com/flatcar/ignition/v2/internal/exec/stages" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ _ "github.com/flatcar/ignition/v2/internal/register" -+ "github.com/flatcar/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/internal/version" - "github.com/spf13/pflag" - ) - -diff --git a/internal/platform/platform.go b/internal/platform/platform.go -index a4815261..c09a5cb9 100644 ---- a/internal/platform/platform.go -+++ b/internal/platform/platform.go -@@ -18,11 +18,11 @@ import ( - "errors" - "fmt" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/registry" -- "github.com/coreos/ignition/v2/internal/resource" -- "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/registry" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/internal/state" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/akamai/akamai.go b/internal/providers/akamai/akamai.go -index 6003acb1..c8b5db1a 100644 ---- a/internal/providers/akamai/akamai.go -+++ b/internal/providers/akamai/akamai.go -@@ -24,10 +24,10 @@ import ( - "net/http" - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/aliyun/aliyun.go b/internal/providers/aliyun/aliyun.go -index ff956a4d..2b4832e6 100644 ---- a/internal/providers/aliyun/aliyun.go -+++ b/internal/providers/aliyun/aliyun.go -@@ -20,10 +20,10 @@ package aliyun - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/applehv/applehv.go b/internal/providers/applehv/applehv.go -index a89d3687..73ea49f5 100644 ---- a/internal/providers/applehv/applehv.go -+++ b/internal/providers/applehv/applehv.go -@@ -23,11 +23,11 @@ import ( - "os" - "os/exec" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" - "github.com/mdlayher/vsock" - ) -diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go -index ed6e6763..26a2c7a4 100644 ---- a/internal/providers/aws/aws.go -+++ b/internal/providers/aws/aws.go -@@ -24,11 +24,11 @@ import ( - "net/url" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds" -@@ -94,7 +94,7 @@ func doInit(f *resource.Fetcher) error { - // every stage) but that would risk premature timeouts if the - // network takes a while to come up. - // -- // https://github.com/coreos/ignition/issues/1158 -+ // https://github.com/flatcar/ignition/issues/1158 - // - // TODO: investigate alternative solutions (adding a Retryer to the - // aws.Config, fetching the region from an HTTP URL, handle the -diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go -index 610db4e0..e6876cf0 100644 ---- a/internal/providers/azure/azure.go -+++ b/internal/providers/azure/azure.go -@@ -26,13 +26,13 @@ import ( - "time" - - "github.com/Azure/azure-sdk-for-go/sdk/azidentity" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- execUtil "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ execUtil "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - "golang.org/x/sys/unix" -@@ -133,7 +133,7 @@ func fetchFromIMDS(f *resource.Fetcher) ([]byte, error) { - // Azure IMDS expects some codes <500 to still be retried... - // Here, we match the cloud-init set. - // https://github.com/canonical/cloud-init/commit/c1a2047cf291 -- // https://github.com/coreos/ignition/issues/1806 -+ // https://github.com/flatcar/ignition/issues/1806 - retryCodes := []int{ - 404, // not found - 410, // gone -diff --git a/internal/providers/azurestack/azurestack.go b/internal/providers/azurestack/azurestack.go -index 06e2705b..7b128ef2 100644 ---- a/internal/providers/azurestack/azurestack.go -+++ b/internal/providers/azurestack/azurestack.go -@@ -18,10 +18,10 @@ - package azurestack - - import ( -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/azure" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/azure" -+ "github.com/flatcar/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" - ) - -diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go -index 0a27874c..db931000 100644 ---- a/internal/providers/cloudstack/cloudstack.go -+++ b/internal/providers/cloudstack/cloudstack.go -@@ -30,13 +30,13 @@ import ( - "strings" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -@@ -56,7 +56,7 @@ func init() { - func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - // The fetch-offline approach doesn't work well here because of the "split - // personality" of this provider. See: -- // https://github.com/coreos/ignition/issues/1081 -+ // https://github.com/flatcar/ignition/issues/1081 - if f.Offline { - return types.Config{}, report.Report{}, resource.ErrNeedNet - } -diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index b0d774ff..ad5a8426 100644 ---- a/internal/providers/cmdline/cmdline.go -+++ b/internal/providers/cmdline/cmdline.go -@@ -22,12 +22,12 @@ import ( - "os" - "strings" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/digitalocean/digitalocean.go b/internal/providers/digitalocean/digitalocean.go -index bbf4f757..6402c631 100644 ---- a/internal/providers/digitalocean/digitalocean.go -+++ b/internal/providers/digitalocean/digitalocean.go -@@ -20,10 +20,10 @@ package digitalocean - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/exoscale/exoscale.go b/internal/providers/exoscale/exoscale.go -index 59d35107..3583f8a3 100644 ---- a/internal/providers/exoscale/exoscale.go -+++ b/internal/providers/exoscale/exoscale.go -@@ -20,10 +20,10 @@ package exoscale - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/file/file.go b/internal/providers/file/file.go -index 224ae6f9..285755c9 100644 ---- a/internal/providers/file/file.go -+++ b/internal/providers/file/file.go -@@ -17,10 +17,10 @@ package file - import ( - "os" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/gcp/gcp.go b/internal/providers/gcp/gcp.go -index b1fa5b5d..0197e87c 100644 ---- a/internal/providers/gcp/gcp.go -+++ b/internal/providers/gcp/gcp.go -@@ -21,10 +21,10 @@ import ( - "net/http" - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/hetzner/hetzner.go b/internal/providers/hetzner/hetzner.go -index 2faecbc9..4510c648 100644 ---- a/internal/providers/hetzner/hetzner.go -+++ b/internal/providers/hetzner/hetzner.go -@@ -20,10 +20,10 @@ package hetzner - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/hyperv/kvp.go b/internal/providers/hyperv/kvp.go -index df71a214..09e77fb4 100644 ---- a/internal/providers/hyperv/kvp.go -+++ b/internal/providers/hyperv/kvp.go -@@ -21,12 +21,12 @@ import ( - "path/filepath" - - "github.com/containers/libhvee/pkg/kvp" -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" - ) - -diff --git a/internal/providers/ibmcloud/ibmcloud.go b/internal/providers/ibmcloud/ibmcloud.go -index 8faec1f6..14dedea1 100644 ---- a/internal/providers/ibmcloud/ibmcloud.go -+++ b/internal/providers/ibmcloud/ibmcloud.go -@@ -26,13 +26,13 @@ import ( - "path/filepath" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/kubevirt/kubevirt.go b/internal/providers/kubevirt/kubevirt.go -index dc77bcc3..f00c5215 100644 ---- a/internal/providers/kubevirt/kubevirt.go -+++ b/internal/providers/kubevirt/kubevirt.go -@@ -27,13 +27,13 @@ import ( - "sync" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go -index 83158866..5e65ad22 100644 ---- a/internal/providers/metal/metal.go -+++ b/internal/providers/metal/metal.go -@@ -17,10 +17,10 @@ - package metal - - import ( -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/nutanix/nutanix.go b/internal/providers/nutanix/nutanix.go -index 32b18f84..4e0c36d1 100644 ---- a/internal/providers/nutanix/nutanix.go -+++ b/internal/providers/nutanix/nutanix.go -@@ -25,13 +25,13 @@ import ( - "path/filepath" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/nvidiabluefield/nvidiabluefield.go b/internal/providers/nvidiabluefield/nvidiabluefield.go -index 5afc6752..c650400a 100644 ---- a/internal/providers/nvidiabluefield/nvidiabluefield.go -+++ b/internal/providers/nvidiabluefield/nvidiabluefield.go -@@ -22,11 +22,11 @@ import ( - "os" - "os/exec" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go -index 803c6f39..398dcac8 100644 ---- a/internal/providers/openstack/openstack.go -+++ b/internal/providers/openstack/openstack.go -@@ -31,13 +31,13 @@ import ( - "sync" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -@@ -77,7 +77,7 @@ func init() { - func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - // The fetch-offline approach doesn't work well here because of the "split - // personality" of this provider. See: -- // https://github.com/coreos/ignition/issues/1081 -+ // https://github.com/flatcar/ignition/issues/1081 - if f.Offline { - return types.Config{}, report.Report{}, resource.ErrNeedNet - } -diff --git a/internal/providers/oraclecloud/oraclecloud.go b/internal/providers/oraclecloud/oraclecloud.go -index 4ad38252..f2cbca33 100644 ---- a/internal/providers/oraclecloud/oraclecloud.go -+++ b/internal/providers/oraclecloud/oraclecloud.go -@@ -24,10 +24,10 @@ import ( - "net/http" - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go -index fe4636d2..1f16b4c1 100644 ---- a/internal/providers/packet/packet.go -+++ b/internal/providers/packet/packet.go -@@ -25,10 +25,10 @@ import ( - "net/url" - "strings" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/powervs/powervs.go b/internal/providers/powervs/powervs.go -index cdbb5e0c..e6a957bd 100644 ---- a/internal/providers/powervs/powervs.go -+++ b/internal/providers/powervs/powervs.go -@@ -24,13 +24,13 @@ import ( - "path/filepath" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/proxmoxve/proxmoxve.go b/internal/providers/proxmoxve/proxmoxve.go -index ca603e9c..6cc27f0d 100644 ---- a/internal/providers/proxmoxve/proxmoxve.go -+++ b/internal/providers/proxmoxve/proxmoxve.go -@@ -28,13 +28,13 @@ import ( - "path/filepath" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -- ut "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" -+ ut "github.com/flatcar/ignition/v2/internal/util" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/qemu/qemu_blockdev.go b/internal/providers/qemu/qemu_blockdev.go -index 3fff4d0a..8b5e90dc 100644 ---- a/internal/providers/qemu/qemu_blockdev.go -+++ b/internal/providers/qemu/qemu_blockdev.go -@@ -26,12 +26,12 @@ import ( - "os/exec" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index 4014876d..a0b25902 100644 ---- a/internal/providers/qemu/qemu_fwcfg.go -+++ b/internal/providers/qemu/qemu_fwcfg.go -@@ -28,11 +28,11 @@ import ( - "strings" - "time" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/scaleway/scaleway.go b/internal/providers/scaleway/scaleway.go -index 855d6547..05f47e9b 100644 ---- a/internal/providers/scaleway/scaleway.go -+++ b/internal/providers/scaleway/scaleway.go -@@ -22,10 +22,10 @@ import ( - "math/rand" - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/system/system.go b/internal/providers/system/system.go -index 319b736c..6bc61f22 100644 ---- a/internal/providers/system/system.go -+++ b/internal/providers/system/system.go -@@ -18,13 +18,13 @@ import ( - "os" - "path/filepath" - -- latest "github.com/coreos/ignition/v2/config/v3_7_experimental" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ latest "github.com/flatcar/ignition/v2/config/v3_7_experimental" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/upcloud/upcloud.go b/internal/providers/upcloud/upcloud.go -index 5f78cda5..f348f9ab 100644 ---- a/internal/providers/upcloud/upcloud.go -+++ b/internal/providers/upcloud/upcloud.go -@@ -21,10 +21,10 @@ package upcloud - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/util/config.go b/internal/providers/util/config.go -index 2ee8e51f..c995939d 100644 ---- a/internal/providers/util/config.go -+++ b/internal/providers/util/config.go -@@ -18,9 +18,9 @@ import ( - "crypto/sha512" - "encoding/hex" - -- "github.com/coreos/ignition/v2/config" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/log" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/util/file.go b/internal/providers/util/file.go -index 5e48c56b..fd7216a1 100644 ---- a/internal/providers/util/file.go -+++ b/internal/providers/util/file.go -@@ -15,8 +15,8 @@ - package util - - import ( -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - - "github.com/vincent-petithory/dataurl" - ) -diff --git a/internal/providers/util/unzip_test.go b/internal/providers/util/unzip_test.go -index 84323de7..e07ec78a 100644 ---- a/internal/providers/util/unzip_test.go -+++ b/internal/providers/util/unzip_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/providers/util" - ) - - func TestTryUnzip(t *testing.T) { -diff --git a/internal/providers/virtualbox/virtualbox.go b/internal/providers/virtualbox/virtualbox.go -index ccf9f433..4279bf07 100644 ---- a/internal/providers/virtualbox/virtualbox.go -+++ b/internal/providers/virtualbox/virtualbox.go -@@ -31,11 +31,11 @@ import ( - "fmt" - "unsafe" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index 08569249..e6fd09c6 100644 ---- a/internal/providers/vmware/vmware_amd64.go -+++ b/internal/providers/vmware/vmware_amd64.go -@@ -20,10 +20,10 @@ package vmware - import ( - "fmt" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - "github.com/vmware/vmw-guestinfo/rpcvmx" -diff --git a/internal/providers/vmware/vmware_unsupported.go b/internal/providers/vmware/vmware_unsupported.go -index ea3684a6..b828f4e9 100644 ---- a/internal/providers/vmware/vmware_unsupported.go -+++ b/internal/providers/vmware/vmware_unsupported.go -@@ -22,9 +22,9 @@ package vmware - import ( - "errors" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/vultr/vultr.go b/internal/providers/vultr/vultr.go -index 5f96588e..da8eb1c5 100644 ---- a/internal/providers/vultr/vultr.go -+++ b/internal/providers/vultr/vultr.go -@@ -21,10 +21,10 @@ package vultr - import ( - "net/url" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - - "github.com/coreos/vcontext/report" - ) -diff --git a/internal/providers/zvm/zvm.go b/internal/providers/zvm/zvm.go -index c8509125..981d2b09 100644 ---- a/internal/providers/zvm/zvm.go -+++ b/internal/providers/zvm/zvm.go -@@ -24,13 +24,13 @@ import ( - "os/exec" - "strings" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/platform" -- "github.com/coreos/ignition/v2/internal/providers/util" -- "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/platform" -+ "github.com/flatcar/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/internal/resource" - "github.com/coreos/vcontext/report" - ) - -diff --git a/internal/register/providers.go b/internal/register/providers.go -index 7cde7f74..93ef2a02 100644 ---- a/internal/register/providers.go -+++ b/internal/register/providers.go -@@ -15,34 +15,34 @@ - package register - - import ( -- _ "github.com/coreos/ignition/v2/internal/providers/akamai" -- _ "github.com/coreos/ignition/v2/internal/providers/aliyun" -- _ "github.com/coreos/ignition/v2/internal/providers/applehv" -- _ "github.com/coreos/ignition/v2/internal/providers/aws" -- _ "github.com/coreos/ignition/v2/internal/providers/azure" -- _ "github.com/coreos/ignition/v2/internal/providers/azurestack" -- _ "github.com/coreos/ignition/v2/internal/providers/cloudstack" -- _ "github.com/coreos/ignition/v2/internal/providers/digitalocean" -- _ "github.com/coreos/ignition/v2/internal/providers/exoscale" -- _ "github.com/coreos/ignition/v2/internal/providers/file" -- _ "github.com/coreos/ignition/v2/internal/providers/gcp" -- _ "github.com/coreos/ignition/v2/internal/providers/hetzner" -- _ "github.com/coreos/ignition/v2/internal/providers/hyperv" -- _ "github.com/coreos/ignition/v2/internal/providers/ibmcloud" -- _ "github.com/coreos/ignition/v2/internal/providers/kubevirt" -- _ "github.com/coreos/ignition/v2/internal/providers/metal" -- _ "github.com/coreos/ignition/v2/internal/providers/nutanix" -- _ "github.com/coreos/ignition/v2/internal/providers/nvidiabluefield" -- _ "github.com/coreos/ignition/v2/internal/providers/openstack" -- _ "github.com/coreos/ignition/v2/internal/providers/oraclecloud" -- _ "github.com/coreos/ignition/v2/internal/providers/packet" -- _ "github.com/coreos/ignition/v2/internal/providers/powervs" -- _ "github.com/coreos/ignition/v2/internal/providers/proxmoxve" -- _ "github.com/coreos/ignition/v2/internal/providers/qemu" -- _ "github.com/coreos/ignition/v2/internal/providers/scaleway" -- _ "github.com/coreos/ignition/v2/internal/providers/upcloud" -- _ "github.com/coreos/ignition/v2/internal/providers/virtualbox" -- _ "github.com/coreos/ignition/v2/internal/providers/vmware" -- _ "github.com/coreos/ignition/v2/internal/providers/vultr" -- _ "github.com/coreos/ignition/v2/internal/providers/zvm" -+ _ "github.com/flatcar/ignition/v2/internal/providers/akamai" -+ _ "github.com/flatcar/ignition/v2/internal/providers/aliyun" -+ _ "github.com/flatcar/ignition/v2/internal/providers/applehv" -+ _ "github.com/flatcar/ignition/v2/internal/providers/aws" -+ _ "github.com/flatcar/ignition/v2/internal/providers/azure" -+ _ "github.com/flatcar/ignition/v2/internal/providers/azurestack" -+ _ "github.com/flatcar/ignition/v2/internal/providers/cloudstack" -+ _ "github.com/flatcar/ignition/v2/internal/providers/digitalocean" -+ _ "github.com/flatcar/ignition/v2/internal/providers/exoscale" -+ _ "github.com/flatcar/ignition/v2/internal/providers/file" -+ _ "github.com/flatcar/ignition/v2/internal/providers/gcp" -+ _ "github.com/flatcar/ignition/v2/internal/providers/hetzner" -+ _ "github.com/flatcar/ignition/v2/internal/providers/hyperv" -+ _ "github.com/flatcar/ignition/v2/internal/providers/ibmcloud" -+ _ "github.com/flatcar/ignition/v2/internal/providers/kubevirt" -+ _ "github.com/flatcar/ignition/v2/internal/providers/metal" -+ _ "github.com/flatcar/ignition/v2/internal/providers/nutanix" -+ _ "github.com/flatcar/ignition/v2/internal/providers/nvidiabluefield" -+ _ "github.com/flatcar/ignition/v2/internal/providers/openstack" -+ _ "github.com/flatcar/ignition/v2/internal/providers/oraclecloud" -+ _ "github.com/flatcar/ignition/v2/internal/providers/packet" -+ _ "github.com/flatcar/ignition/v2/internal/providers/powervs" -+ _ "github.com/flatcar/ignition/v2/internal/providers/proxmoxve" -+ _ "github.com/flatcar/ignition/v2/internal/providers/qemu" -+ _ "github.com/flatcar/ignition/v2/internal/providers/scaleway" -+ _ "github.com/flatcar/ignition/v2/internal/providers/upcloud" -+ _ "github.com/flatcar/ignition/v2/internal/providers/virtualbox" -+ _ "github.com/flatcar/ignition/v2/internal/providers/vmware" -+ _ "github.com/flatcar/ignition/v2/internal/providers/vultr" -+ _ "github.com/flatcar/ignition/v2/internal/providers/zvm" - ) -diff --git a/internal/register/stages.go b/internal/register/stages.go -index 98c05214..b8043835 100644 ---- a/internal/register/stages.go -+++ b/internal/register/stages.go -@@ -15,11 +15,11 @@ - package register - - import ( -- _ "github.com/coreos/ignition/v2/internal/exec/stages/disks" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/fetch_offline" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/files" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/kargs" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/mount" -- _ "github.com/coreos/ignition/v2/internal/exec/stages/umount" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch_offline" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/files" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/kargs" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/mount" -+ _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" - ) -diff --git a/internal/resource/http.go b/internal/resource/http.go -index da1541fd..dcf2fe1d 100644 ---- a/internal/resource/http.go -+++ b/internal/resource/http.go -@@ -29,12 +29,12 @@ import ( - "strings" - "time" - -- ignerrors "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/earlyrand" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/util" -- "github.com/coreos/ignition/v2/internal/version" -+ ignerrors "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/earlyrand" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/internal/version" - - "github.com/vincent-petithory/dataurl" - -@@ -255,7 +255,7 @@ func defaultHTTPClient() (*http.Client, error) { - // > is of concern in your application, use getrandom(2) or - // > /dev/random instead. - // -- // See https://github.com/coreos/ignition/issues/645 -+ // See https://github.com/flatcar/ignition/issues/645 - urand, err := earlyrand.UrandomReader() - if err != nil { - return nil, err -diff --git a/internal/resource/url.go b/internal/resource/url.go -index 18b6d746..8d00d823 100644 ---- a/internal/resource/url.go -+++ b/internal/resource/url.go -@@ -35,15 +35,15 @@ import ( - - "cloud.google.com/go/compute/metadata" - "cloud.google.com/go/storage" -- configErrors "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/util" -+ configErrors "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/util" - "github.com/coreos/vcontext/report" - "golang.org/x/oauth2/google" - "google.golang.org/api/option" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- providersUtil "github.com/coreos/ignition/v2/internal/providers/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ providersUtil "github.com/flatcar/ignition/v2/internal/providers/util" - - "github.com/Azure/azure-sdk-for-go/sdk/azidentity" - "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob" -diff --git a/internal/resource/url_test.go b/internal/resource/url_test.go -index 4394e4ca..24a982cd 100644 ---- a/internal/resource/url_test.go -+++ b/internal/resource/url_test.go -@@ -24,9 +24,9 @@ import ( - - "github.com/stretchr/testify/assert" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/internal/log" -- "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/internal/util" - ) - - func TestDataUrl(t *testing.T) { -diff --git a/internal/sgdisk/sgdisk.go b/internal/sgdisk/sgdisk.go -index ffd3d9ca..587b94dd 100644 ---- a/internal/sgdisk/sgdisk.go -+++ b/internal/sgdisk/sgdisk.go -@@ -19,10 +19,10 @@ import ( - "io" - "os/exec" - -- "github.com/coreos/ignition/v2/config/util" -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/internal/distro" -- "github.com/coreos/ignition/v2/internal/log" -+ "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/internal/distro" -+ "github.com/flatcar/ignition/v2/internal/log" - ) - - type Operation struct { -diff --git a/internal/state/state.go b/internal/state/state.go -index 8aa0ec90..95d582da 100644 ---- a/internal/state/state.go -+++ b/internal/state/state.go -@@ -20,7 +20,7 @@ import ( - "os" - "path/filepath" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - type State struct { -diff --git a/internal/util/tools/docs/docs.go b/internal/util/tools/docs/docs.go -index 11731ada..8d516fca 100644 ---- a/internal/util/tools/docs/docs.go -+++ b/internal/util/tools/docs/docs.go -@@ -24,7 +24,7 @@ import ( - "path/filepath" - "strings" - -- "github.com/coreos/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/config" - ) - - // Specific section marker used in the docs to indicate that the Markdown code -diff --git a/internal/util/verification.go b/internal/util/verification.go -index 070003db..07f5af75 100644 ---- a/internal/util/verification.go -+++ b/internal/util/verification.go -@@ -23,7 +23,7 @@ import ( - "hash" - "strings" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - var ( -diff --git a/internal/util/verification_test.go b/internal/util/verification_test.go -index dd919cc0..07de9fc4 100644 ---- a/internal/util/verification_test.go -+++ b/internal/util/verification_test.go -@@ -18,7 +18,7 @@ import ( - "reflect" - "testing" - -- "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - ) - - func TestAssertValid(t *testing.T) { -diff --git a/tests/blackbox_test.go b/tests/blackbox_test.go -index 5bcb4da8..8c9ec843 100644 ---- a/tests/blackbox_test.go -+++ b/tests/blackbox_test.go -@@ -26,14 +26,14 @@ import ( - "testing" - "time" - -- "github.com/coreos/ignition/v2/config" -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/servers" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/servers" -+ "github.com/flatcar/ignition/v2/tests/types" - - // Register the tests -- _ "github.com/coreos/ignition/v2/tests/registry" -+ _ "github.com/flatcar/ignition/v2/tests/registry" - - // UUID generation tool - "github.com/google/uuid" -diff --git a/tests/filesystem.go b/tests/filesystem.go -index 76b389b3..ed9789c5 100644 ---- a/tests/filesystem.go -+++ b/tests/filesystem.go -@@ -31,8 +31,8 @@ import ( - "strings" - "testing" - -- ut "github.com/coreos/ignition/v2/internal/util" -- "github.com/coreos/ignition/v2/tests/types" -+ ut "github.com/flatcar/ignition/v2/internal/util" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func run(ctx context.Context, command string, args ...string) ([]byte, error) { -diff --git a/tests/negative/files/invalid_hash.go b/tests/negative/files/invalid_hash.go -index e4bab782..0c4dfead 100644 ---- a/tests/negative/files/invalid_hash.go -+++ b/tests/negative/files/invalid_hash.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/files/link.go b/tests/negative/files/link.go -index a4cf1d66..8d4128b2 100644 ---- a/tests/negative/files/link.go -+++ b/tests/negative/files/link.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/files/missing_file.go b/tests/negative/files/missing_file.go -index 3abfb574..251f5593 100644 ---- a/tests/negative/files/missing_file.go -+++ b/tests/negative/files/missing_file.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/files/preexisting_nodes.go b/tests/negative/files/preexisting_nodes.go -index 6a80fae6..0981e95e 100644 ---- a/tests/negative/files/preexisting_nodes.go -+++ b/tests/negative/files/preexisting_nodes.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/filesystems/creation.go b/tests/negative/filesystems/creation.go -index db132cac..1c538658 100644 ---- a/tests/negative/filesystems/creation.go -+++ b/tests/negative/filesystems/creation.go -@@ -15,8 +15,8 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/filesystems/mount_filesystem.go b/tests/negative/filesystems/mount_filesystem.go -index 7665a82b..13f4acdf 100644 ---- a/tests/negative/filesystems/mount_filesystem.go -+++ b/tests/negative/filesystems/mount_filesystem.go -@@ -15,8 +15,8 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/filesystems/no_device.go b/tests/negative/filesystems/no_device.go -index 2166e532..4387c396 100644 ---- a/tests/negative/filesystems/no_device.go -+++ b/tests/negative/filesystems/no_device.go -@@ -15,8 +15,8 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/filesystems/symlinks.go b/tests/negative/filesystems/symlinks.go -index e62ee681..b3aff932 100644 ---- a/tests/negative/filesystems/symlinks.go -+++ b/tests/negative/filesystems/symlinks.go -@@ -15,8 +15,8 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/general/config.go b/tests/negative/general/config.go -index 91ab153f..fc4b215b 100644 ---- a/tests/negative/general/config.go -+++ b/tests/negative/general/config.go -@@ -17,8 +17,8 @@ package general - import ( - "fmt" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - - "github.com/vincent-petithory/dataurl" - ) -diff --git a/tests/negative/luks/creation.go b/tests/negative/luks/creation.go -index 678dc5d3..3ac94b7c 100644 ---- a/tests/negative/luks/creation.go -+++ b/tests/negative/luks/creation.go -@@ -15,8 +15,8 @@ - package luks - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/partitions/simple.go b/tests/negative/partitions/simple.go -index ae6f50f5..79911208 100644 ---- a/tests/negative/partitions/simple.go -+++ b/tests/negative/partitions/simple.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/partitions/zeroes.go b/tests/negative/partitions/zeroes.go -index f9d258c0..1c0603a1 100644 ---- a/tests/negative/partitions/zeroes.go -+++ b/tests/negative/partitions/zeroes.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/proxy/http.go b/tests/negative/proxy/http.go -index 7492f940..c219792d 100644 ---- a/tests/negative/proxy/http.go -+++ b/tests/negative/proxy/http.go -@@ -19,8 +19,8 @@ import ( - "net/http" - "net/http/httptest" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - var ( -diff --git a/tests/negative/regression/filesystem.go b/tests/negative/regression/filesystem.go -index 0627c635..37a13f8f 100644 ---- a/tests/negative/regression/filesystem.go -+++ b/tests/negative/regression/filesystem.go -@@ -15,8 +15,8 @@ - package regression - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/security/tls.go b/tests/negative/security/tls.go -index 83149e89..1c4d59ac 100644 ---- a/tests/negative/security/tls.go -+++ b/tests/negative/security/tls.go -@@ -22,9 +22,9 @@ import ( - "net/http" - "net/http/httptest" - -- "github.com/coreos/ignition/v2/tests/fixtures" -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/fixtures" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/negative/timeouts/timeouts.go b/tests/negative/timeouts/timeouts.go -index b89f33f7..e6997c5a 100644 ---- a/tests/negative/timeouts/timeouts.go -+++ b/tests/negative/timeouts/timeouts.go -@@ -20,8 +20,8 @@ import ( - "net/http/httptest" - "time" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/files/directory.go b/tests/positive/files/directory.go -index 5bda64c1..056aa259 100644 ---- a/tests/positive/files/directory.go -+++ b/tests/positive/files/directory.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/files/file.go b/tests/positive/files/file.go -index bd2d952a..0b885225 100644 ---- a/tests/positive/files/file.go -+++ b/tests/positive/files/file.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -@@ -559,7 +559,7 @@ func ApplyCustomFilePermissions() types.Test { - func ApplyCustomFilePermissionsBeforeBugfix() types.Test { - // This test is put here to ensure that we don't accidentally fix configs that were not working before the fix. - // Ensure all versions before the bugfix are still losing special bits. -- // See: https://github.com/coreos/ignition/issues/2042 -+ // See: https://github.com/flatcar/ignition/issues/2042 - name := "files.customperms.pre-#2042-fix" - in := types.GetBaseDisk() - out := types.GetBaseDisk() -diff --git a/tests/positive/files/hash.go b/tests/positive/files/hash.go -index 3e1f4904..a43aa982 100644 ---- a/tests/positive/files/hash.go -+++ b/tests/positive/files/hash.go -@@ -17,9 +17,9 @@ package files - import ( - "strings" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/servers" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/servers" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/files/link.go b/tests/positive/files/link.go -index 72dd1b1f..ea21f539 100644 ---- a/tests/positive/files/link.go -+++ b/tests/positive/files/link.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -@@ -364,7 +364,7 @@ func ForceHardLinkCreation() types.Test { - - // CreateDeepHardLinkToFile checks if Ignition can create a hard - // link to a file that's deeper than the hard link. For more --// information: https://github.com/coreos/ignition/issues/800 -+// information: https://github.com/flatcar/ignition/issues/800 - func CreateDeepHardLinkToFile() types.Test { - name := "links.hard.deep.create.file" - in := types.GetBaseDisk() -diff --git a/tests/positive/files/remote.go b/tests/positive/files/remote.go -index e3b5e03c..b325e31e 100644 ---- a/tests/positive/files/remote.go -+++ b/tests/positive/files/remote.go -@@ -17,9 +17,9 @@ package files - import ( - "strings" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/servers" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/servers" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/files/units.go b/tests/positive/files/units.go -index 03e24ea7..f17efc5a 100644 ---- a/tests/positive/files/units.go -+++ b/tests/positive/files/units.go -@@ -15,8 +15,8 @@ - package files - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/filesystems/creation.go b/tests/positive/filesystems/creation.go -index 45741945..d4350779 100644 ---- a/tests/positive/filesystems/creation.go -+++ b/tests/positive/filesystems/creation.go -@@ -17,8 +17,8 @@ package filesystems - import ( - "fmt" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/filesystems/mount_filesystem.go b/tests/positive/filesystems/mount_filesystem.go -index daa72d7d..2cc76c38 100644 ---- a/tests/positive/filesystems/mount_filesystem.go -+++ b/tests/positive/filesystems/mount_filesystem.go -@@ -15,8 +15,8 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/filesystems/reformat_filesystem.go b/tests/positive/filesystems/reformat_filesystem.go -index ffa57b10..b83aea03 100644 ---- a/tests/positive/filesystems/reformat_filesystem.go -+++ b/tests/positive/filesystems/reformat_filesystem.go -@@ -15,9 +15,9 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/fixtures" -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/fixtures" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/filesystems/reuse_filesystem.go b/tests/positive/filesystems/reuse_filesystem.go -index bb83da30..77c33a51 100644 ---- a/tests/positive/filesystems/reuse_filesystem.go -+++ b/tests/positive/filesystems/reuse_filesystem.go -@@ -15,9 +15,9 @@ - package filesystems - - import ( -- "github.com/coreos/ignition/v2/tests/fixtures" -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/fixtures" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/general/baseconfigsmerging.go b/tests/positive/general/baseconfigsmerging.go -index be667be2..5ed84b26 100644 ---- a/tests/positive/general/baseconfigsmerging.go -+++ b/tests/positive/general/baseconfigsmerging.go -@@ -15,8 +15,8 @@ - package general - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/general/general.go b/tests/positive/general/general.go -index ff7722f7..79a0453e 100644 ---- a/tests/positive/general/general.go -+++ b/tests/positive/general/general.go -@@ -17,9 +17,9 @@ package general - import ( - "strings" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/servers" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/servers" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/general/preemption.go b/tests/positive/general/preemption.go -index 5952097f..3c0d62dd 100644 ---- a/tests/positive/general/preemption.go -+++ b/tests/positive/general/preemption.go -@@ -18,8 +18,8 @@ import ( - "fmt" - "strings" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/luks/creation.go b/tests/positive/luks/creation.go -index 7a6d1141..08d67728 100644 ---- a/tests/positive/luks/creation.go -+++ b/tests/positive/luks/creation.go -@@ -15,8 +15,8 @@ - package luks - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/complex-mb.go b/tests/positive/partitions/complex-mb.go -index 5c090e80..86e0ff2f 100644 ---- a/tests/positive/partitions/complex-mb.go -+++ b/tests/positive/partitions/complex-mb.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/creation-mb.go b/tests/positive/partitions/creation-mb.go -index 696108a1..dcba68a5 100644 ---- a/tests/positive/partitions/creation-mb.go -+++ b/tests/positive/partitions/creation-mb.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/deletion.go b/tests/positive/partitions/deletion.go -index 4e32d3cd..1dde4830 100644 ---- a/tests/positive/partitions/deletion.go -+++ b/tests/positive/partitions/deletion.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/mixed.go b/tests/positive/partitions/mixed.go -index 31402918..f7505dbe 100644 ---- a/tests/positive/partitions/mixed.go -+++ b/tests/positive/partitions/mixed.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/no-op.go b/tests/positive/partitions/no-op.go -index 58c6bbb0..40b11716 100644 ---- a/tests/positive/partitions/no-op.go -+++ b/tests/positive/partitions/no-op.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/verification.go b/tests/positive/partitions/verification.go -index 1488e499..efad6d68 100644 ---- a/tests/positive/partitions/verification.go -+++ b/tests/positive/partitions/verification.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/wipe.go b/tests/positive/partitions/wipe.go -index da8b34bf..f84e6040 100644 ---- a/tests/positive/partitions/wipe.go -+++ b/tests/positive/partitions/wipe.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/partitions/zeros.go b/tests/positive/partitions/zeros.go -index 10d32990..d53a7bd5 100644 ---- a/tests/positive/partitions/zeros.go -+++ b/tests/positive/partitions/zeros.go -@@ -15,8 +15,8 @@ - package partitions - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/passwd/users.go b/tests/positive/passwd/users.go -index 9648beb0..def58e65 100644 ---- a/tests/positive/passwd/users.go -+++ b/tests/positive/passwd/users.go -@@ -15,8 +15,8 @@ - package passwd - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/proxy/http.go b/tests/positive/proxy/http.go -index 1863c744..8b03ec9f 100644 ---- a/tests/positive/proxy/http.go -+++ b/tests/positive/proxy/http.go -@@ -19,8 +19,8 @@ import ( - "net/http" - "net/http/httptest" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - var ( -diff --git a/tests/positive/regression/filesystem.go b/tests/positive/regression/filesystem.go -index 329d14bd..58fd5217 100644 ---- a/tests/positive/regression/filesystem.go -+++ b/tests/positive/regression/filesystem.go -@@ -15,8 +15,8 @@ - package regression - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/security/tls.go b/tests/positive/security/tls.go -index 0b52d784..d43ae179 100644 ---- a/tests/positive/security/tls.go -+++ b/tests/positive/security/tls.go -@@ -20,10 +20,10 @@ import ( - "net/http" - "net/http/httptest" - -- "github.com/coreos/ignition/v2/tests/fixtures" -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/servers" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/fixtures" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/servers" -+ "github.com/flatcar/ignition/v2/tests/types" - - "github.com/vincent-petithory/dataurl" - ) -diff --git a/tests/positive/systemd/create_unit.go b/tests/positive/systemd/create_unit.go -index 1964a602..71fcae85 100644 ---- a/tests/positive/systemd/create_unit.go -+++ b/tests/positive/systemd/create_unit.go -@@ -15,8 +15,8 @@ - package systemd - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/systemd/modify_service.go b/tests/positive/systemd/modify_service.go -index a3faf958..ae625e76 100644 ---- a/tests/positive/systemd/modify_service.go -+++ b/tests/positive/systemd/modify_service.go -@@ -15,8 +15,8 @@ - package systemd - - import ( -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/positive/timeouts/timeouts.go b/tests/positive/timeouts/timeouts.go -index 34408293..24a0bc61 100644 ---- a/tests/positive/timeouts/timeouts.go -+++ b/tests/positive/timeouts/timeouts.go -@@ -21,8 +21,8 @@ import ( - "sync" - "time" - -- "github.com/coreos/ignition/v2/tests/register" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/tests/register" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - func init() { -diff --git a/tests/register/register.go b/tests/register/register.go -index 6d047abd..f48edc07 100644 ---- a/tests/register/register.go -+++ b/tests/register/register.go -@@ -16,15 +16,15 @@ package register - - import ( - "github.com/coreos/go-semver/semver" -- types30 "github.com/coreos/ignition/v2/config/v3_0/types" -- types31 "github.com/coreos/ignition/v2/config/v3_1/types" -- types32 "github.com/coreos/ignition/v2/config/v3_2/types" -- types33 "github.com/coreos/ignition/v2/config/v3_3/types" -- types34 "github.com/coreos/ignition/v2/config/v3_4/types" -- types35 "github.com/coreos/ignition/v2/config/v3_5/types" -- types36 "github.com/coreos/ignition/v2/config/v3_6/types" -- types_exp "github.com/coreos/ignition/v2/config/v3_7_experimental/types" -- "github.com/coreos/ignition/v2/tests/types" -+ types30 "github.com/flatcar/ignition/v2/config/v3_0/types" -+ types31 "github.com/flatcar/ignition/v2/config/v3_1/types" -+ types32 "github.com/flatcar/ignition/v2/config/v3_2/types" -+ types33 "github.com/flatcar/ignition/v2/config/v3_3/types" -+ types34 "github.com/flatcar/ignition/v2/config/v3_4/types" -+ types35 "github.com/flatcar/ignition/v2/config/v3_5/types" -+ types36 "github.com/flatcar/ignition/v2/config/v3_6/types" -+ types_exp "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" -+ "github.com/flatcar/ignition/v2/tests/types" - ) - - type TestType int -diff --git a/tests/registry/registry.go b/tests/registry/registry.go -index dc0f01fa..77207404 100644 ---- a/tests/registry/registry.go -+++ b/tests/registry/registry.go -@@ -16,24 +16,24 @@ package registry - - // Done to import the tests - import ( -- _ "github.com/coreos/ignition/v2/tests/negative/files" -- _ "github.com/coreos/ignition/v2/tests/negative/filesystems" -- _ "github.com/coreos/ignition/v2/tests/negative/general" -- _ "github.com/coreos/ignition/v2/tests/negative/luks" -- _ "github.com/coreos/ignition/v2/tests/negative/partitions" -- _ "github.com/coreos/ignition/v2/tests/negative/proxy" -- _ "github.com/coreos/ignition/v2/tests/negative/regression" -- _ "github.com/coreos/ignition/v2/tests/negative/security" -- _ "github.com/coreos/ignition/v2/tests/negative/timeouts" -- _ "github.com/coreos/ignition/v2/tests/positive/files" -- _ "github.com/coreos/ignition/v2/tests/positive/filesystems" -- _ "github.com/coreos/ignition/v2/tests/positive/general" -- _ "github.com/coreos/ignition/v2/tests/positive/luks" -- _ "github.com/coreos/ignition/v2/tests/positive/partitions" -- _ "github.com/coreos/ignition/v2/tests/positive/passwd" -- _ "github.com/coreos/ignition/v2/tests/positive/proxy" -- _ "github.com/coreos/ignition/v2/tests/positive/regression" -- _ "github.com/coreos/ignition/v2/tests/positive/security" -- _ "github.com/coreos/ignition/v2/tests/positive/systemd" -- _ "github.com/coreos/ignition/v2/tests/positive/timeouts" -+ _ "github.com/flatcar/ignition/v2/tests/negative/files" -+ _ "github.com/flatcar/ignition/v2/tests/negative/filesystems" -+ _ "github.com/flatcar/ignition/v2/tests/negative/general" -+ _ "github.com/flatcar/ignition/v2/tests/negative/luks" -+ _ "github.com/flatcar/ignition/v2/tests/negative/partitions" -+ _ "github.com/flatcar/ignition/v2/tests/negative/proxy" -+ _ "github.com/flatcar/ignition/v2/tests/negative/regression" -+ _ "github.com/flatcar/ignition/v2/tests/negative/security" -+ _ "github.com/flatcar/ignition/v2/tests/negative/timeouts" -+ _ "github.com/flatcar/ignition/v2/tests/positive/files" -+ _ "github.com/flatcar/ignition/v2/tests/positive/filesystems" -+ _ "github.com/flatcar/ignition/v2/tests/positive/general" -+ _ "github.com/flatcar/ignition/v2/tests/positive/luks" -+ _ "github.com/flatcar/ignition/v2/tests/positive/partitions" -+ _ "github.com/flatcar/ignition/v2/tests/positive/passwd" -+ _ "github.com/flatcar/ignition/v2/tests/positive/proxy" -+ _ "github.com/flatcar/ignition/v2/tests/positive/regression" -+ _ "github.com/flatcar/ignition/v2/tests/positive/security" -+ _ "github.com/flatcar/ignition/v2/tests/positive/systemd" -+ _ "github.com/flatcar/ignition/v2/tests/positive/timeouts" - ) -diff --git a/tests/servers/servers.go b/tests/servers/servers.go -index eccb6122..9c42f254 100644 ---- a/tests/servers/servers.go -+++ b/tests/servers/servers.go -@@ -27,7 +27,7 @@ import ( - "strings" - "time" - -- "github.com/coreos/ignition/v2/tests/fixtures" -+ "github.com/flatcar/ignition/v2/tests/fixtures" - "github.com/pin/tftp" - ) - -diff --git a/tests/validator.go b/tests/validator.go -index 9e837357..6fa1e6c7 100644 ---- a/tests/validator.go -+++ b/tests/validator.go -@@ -25,8 +25,8 @@ import ( - "strings" - "testing" - -- "github.com/coreos/ignition/v2/internal/exec/util" -- "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar/ignition/v2/internal/exec/util" -+ "github.com/flatcar/ignition/v2/tests/types" - - "golang.org/x/sys/unix" - ) -diff --git a/validate/main.go b/validate/main.go -index f32eb29b..390f5ef8 100644 ---- a/validate/main.go -+++ b/validate/main.go -@@ -21,8 +21,8 @@ import ( - "os" - "strings" - -- "github.com/coreos/ignition/v2/config" -- "github.com/coreos/ignition/v2/internal/version" -+ "github.com/flatcar/ignition/v2/config" -+ "github.com/flatcar/ignition/v2/internal/version" - ) - - var ( --- -2.54.0 - 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/0002-mod-add-flatcar-ignition-0.36.2.patch similarity index 55% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch index 8689999ec27..2519a1b2cca 100644 --- 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/0002-mod-add-flatcar-ignition-0.36.2.patch @@ -1,7 +1,7 @@ -From 8a2a8ef62e4dc4e4910e5cb0d855e665282e83e7 Mon Sep 17 00:00:00 2001 +From 0680a8bf7e00fcd64b0e75de31978d322e3a27ee Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 20 Aug 2026 14:22:56 +0200 -Subject: [PATCH 03/19] mod: add flatcar/ignition@0.36.2 +Subject: [PATCH 02/15] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. @@ -12,57 +12,57 @@ Signed-off-by: Mathieu Tortuyaux 2 files changed, 40 insertions(+) diff --git a/go.mod b/go.mod -index 0c090c5b..3336ee38 100644 +index d438272e..11c402ea 100644 --- a/go.mod +++ b/go.mod -@@ -19,6 +19,7 @@ require ( +@@ -17,6 +17,7 @@ require ( github.com/coreos/go-semver v0.3.1 - github.com/coreos/go-systemd/v22 v22.6.0 + github.com/coreos/go-systemd/v22 v22.7.0 github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 + github.com/flatcar/ignition v0.36.2 - github.com/google/renameio/v2 v2.0.1 + github.com/google/renameio/v2 v2.0.2 github.com/google/uuid v1.6.0 - github.com/mdlayher/vsock v1.2.1 -@@ -48,6 +49,7 @@ require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect + github.com/mdlayher/vsock v1.3.0 +@@ -36,6 +37,7 @@ require ( + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.22.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 // indirect + github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect -@@ -60,6 +62,7 @@ require ( - github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.16 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.35 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.35 // indirect +@@ -46,6 +48,7 @@ require ( + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.36 // indirect + github.com/aws/smithy-go v1.27.6 // 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.2-0.20180830191138-d8f796af33cc // indirect - github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect - github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect -@@ -88,6 +91,7 @@ require ( - go.opentelemetry.io/otel/sdk v1.38.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect - go.opentelemetry.io/otel/trace v1.38.0 // indirect + github.com/godbus/dbus/v5 v5.1.0 // indirect + github.com/golang-jwt/jwt/v5 v5.3.1 // indirect +@@ -55,6 +58,7 @@ require ( + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/rogpeppe/go-internal v1.14.1 // indirect + go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/crypto v0.47.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/text v0.33.0 // indirect + golang.org/x/crypto v0.54.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/text v0.40.0 // indirect diff --git a/go.sum b/go.sum -index fd027529..40bae9cb 100644 +index d2afd68a..c7cf89ca 100644 --- a/go.sum +++ b/go.sum -@@ -44,6 +44,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.54.0/go.mod h1:vB2GH9GAYYJTO3mEn8oYwzEdhlayZIdQz6zdzgUIRvA= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 h1:s0WlVbf9qpvkh1c/uDAPElam0WrL7fHRIidgZJ7UqZI= - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0/go.mod h1:Mf6O40IAyB9zR/1J8nGDDPirZQQPbYJni8Yisy7NTMc= +@@ -16,6 +16,9 @@ github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJ + github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE= + github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 h1:RHK7bS+HQMslb1sZpAokUt+zTVmue0hKSs2C791hhzU= + github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk= +github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s= +github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c= +github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k= - github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU= - github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0= - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU= -@@ -94,12 +97,16 @@ github.com/containers/libhvee v0.10.0 h1:7VLv8keWZpHuGmWvyY4c1mVH5V1JYb1G78VC+8A - github.com/containers/libhvee v0.10.0/go.mod h1:at0h8lRcK5jCKfQgU/e6Io0Mw12F36zRLjXVOXRoDTM= + github.com/aws/aws-sdk-go-v2 v1.43.4 h1:b9FTvbRwy+JCsfp2Wp6wV/KbOx3Aj7nkoFb2cRX0IhE= + github.com/aws/aws-sdk-go-v2 v1.43.4/go.mod h1:70vwSy16txshwG+g55WkpgPKDIByzHI8ccBsOteo3bQ= + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.16 h1:aiuaKlDweRC5qExJondpWjOgyzMHpofpwspGXUtwn4c= +@@ -62,14 +65,22 @@ github.com/containers/libhvee v0.11.0 h1:lh9sN2vl0pWrozAjvudsJaKLN1H6YXaohSn/cCx + github.com/containers/libhvee v0.11.0/go.mod h1:4eTPJpxhHsXWaKXF5KI3/IuN1U/wbTvupLzKfSB8p0E= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= +github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -70,43 +70,31 @@ index fd027529..40bae9cb 100644 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= +github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk= +github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= - github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo= - github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU= + github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj9KI28KA= + github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w= github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM= github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687/go.mod h1:Salmysdw7DAVuobBW/LwsKKgpyCPHUhjyJoMJD+ZJiI= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/envoyproxy/go-control-plane v0.13.5-0.20251024222203-75eaa193e329 h1:K+fnvUM0VZ7ZFJf0n4L/BRlnsb9pL/GuDG6FqaH+PwM= -@@ -112,6 +119,9 @@ github.com/envoyproxy/protoc-gen-validate v1.2.1 h1:DEo3O99U8j4hBFwbJfrz9VtgcDfU - github.com/envoyproxy/protoc-gen-validate v1.2.1/go.mod h1:d/C80l/jxXLdfEIhX1W2TmLfsJ31lvEjwamM4DxlWXU= - github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= - github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4= +github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA= +github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= - github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs= - github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= - github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -@@ -119,6 +129,7 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= - github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= - github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= - github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= - github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= -@@ -139,6 +150,9 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.7 h1:zrn2Ee/nWmHulBx5sAV - github.com/googleapis/enterprise-certificate-proxy v0.3.7/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA= - github.com/googleapis/gax-go/v2 v2.16.0 h1:iHbQmKLLZrexmb0OSsNGTeSTS0HO4YvFOG8g5E4Zd0Y= - github.com/googleapis/gax-go/v2 v2.16.0/go.mod h1:o1vfQjjNZn4+dPnRdl/4ZD7S9414Y4xA+a/6Icj6l14= + github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= +@@ -80,6 +91,9 @@ github.com/google/renameio/v2 v2.0.2 h1:qKZs+tfn+arruZZhQ7TKC/ergJunuJicWS6gLDt/ + github.com/google/renameio/v2 v2.0.2/go.mod h1:OX+G6WHHpHq3NVj7cAOleLOwJfcQ1s3uUJQCrr78SWo= + github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= + github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU= github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -@@ -155,26 +169,36 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 +@@ -96,37 +110,59 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -115,8 +103,6 @@ index fd027529..40bae9cb 100644 github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU= - github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= - github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -128,8 +114,6 @@ index fd027529..40bae9cb 100644 +github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= - github.com/spiffe/go-spiffe/v2 v2.6.0 h1:l+DolpxNWYgruGQVV0xsfeya3CsC7m8iBzDnMpsbLuo= - github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= @@ -140,42 +124,29 @@ index fd027529..40bae9cb 100644 github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY= github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk= +github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI= - go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= - go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= - go.opentelemetry.io/contrib/detectors/gcp v1.38.0 h1:ZoYbqX7OaA/TAikspPl3ozPI6iY6LiIY9I8cUfm+pJs= -@@ -195,21 +219,31 @@ go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6 - go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= - go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= - go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk= +go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= - golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= + golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= + golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= - golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= - golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw= - golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= - golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= - golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= + golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= + golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= + golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= + golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= + golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= + golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= - golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= + golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= + golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= - golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= - golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= - golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= - golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= + golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= + golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= - gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= - gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= - google.golang.org/api v0.259.0 h1:90TaGVIxScrh1Vn/XI2426kRpBqHwWIzVBzJsVZ5XrQ= -@@ -227,5 +261,7 @@ google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -184,5 +155,5 @@ index fd027529..40bae9cb 100644 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-config-v3_7-convert-ignition-2.x-to-3.x.patch similarity index 77% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-config-v3_7-convert-ignition-2.x-to-3.x.patch index 8c7c862b550..f919ca4093e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-config-v3_7-convert-ignition-2.x-to-3.x.patch @@ -1,7 +1,7 @@ -From 18a1200935058a9ab8afc9c05532c62a7344bdfb Mon Sep 17 00:00:00 2001 +From 051aad96d87cbbce464990584663cc5a0a867ec1 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 20 Aug 2026 14:23:22 +0200 -Subject: [PATCH 04/19] config/v3_7: convert ignition 2.x to 3.x +Subject: [PATCH 03/15] config/v3_7: convert ignition 2.x to 3.x if the version of ignition is 2.x we convert it to 3.x using ign-converter. @@ -14,7 +14,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 37 insertions(+) diff --git a/config/v3_7_experimental/config.go b/config/v3_7_experimental/config.go -index 8d02129e..18193de1 100644 +index c82ca703..57c958c7 100644 --- a/config/v3_7_experimental/config.go +++ b/config/v3_7_experimental/config.go @@ -15,9 +15,14 @@ @@ -24,14 +24,14 @@ index 8d02129e..18193de1 100644 + "encoding/json" + "fmt" + -+ "github.com/flatcar/ignition/config/v2_4" - "github.com/flatcar/ignition/v2/config/merge" - "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/flatcar/ignition/v2/config/util" -+ "github.com/flatcar/ignition/v2/config/v24tov31" - prev "github.com/flatcar/ignition/v2/config/v3_6" - "github.com/flatcar/ignition/v2/config/v3_7_experimental/translate" - "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" ++ "github.com/coreos/ignition/config/v2_4" + "github.com/coreos/ignition/v2/config/merge" + "github.com/coreos/ignition/v2/config/shared/errors" + "github.com/coreos/ignition/v2/config/util" ++ "github.com/coreos/ignition/v2/config/v24tov31" + prev "github.com/coreos/ignition/v2/config/v3_6" + "github.com/coreos/ignition/v2/config/v3_7_experimental/translate" + "github.com/coreos/ignition/v2/config/v3_7_experimental/types" @@ -67,6 +72,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) { return types.Config{}, rpt, err } @@ -72,5 +72,5 @@ index 8d02129e..18193de1 100644 return Parse(raw) } -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-internal-prv-cmdline-backport-flatcar-patch.patch new file mode 100644 index 00000000000..bcc6c029979 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-internal-prv-cmdline-backport-flatcar-patch.patch @@ -0,0 +1,44 @@ +From b243d181ee03c845db23b41eadcc9955aff44212 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Mon, 19 Feb 2024 18:12:22 +0100 +Subject: [PATCH 04/15] internal/prv/cmdline: backport flatcar patch + +this patch provides backward compatibility for various config +key + +Signed-off-by: Mathieu Tortuyaux +--- + internal/providers/cmdline/cmdline.go | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go +index b0c66156..580606c0 100644 +--- a/internal/providers/cmdline/cmdline.go ++++ b/internal/providers/cmdline/cmdline.go +@@ -43,9 +43,11 @@ import ( + type cmdlineFlag string + + const ( +- flagUrl cmdlineFlag = "ignition.config.url" +- flagDeviceLabel cmdlineFlag = "ignition.config.device" +- flagUserDataPath cmdlineFlag = "ignition.config.path" ++ flagUrlLegacyCoreOS cmdlineFlag = "coreos.config.url" ++ flagUrlLegacy cmdlineFlag = "flatcar.config.url" ++ flagUrl cmdlineFlag = "ignition.config.url" ++ flagDeviceLabel cmdlineFlag = "ignition.config.device" ++ flagUserDataPath cmdlineFlag = "ignition.config.path" + ) + + type cmdlineOpts struct { +@@ -115,7 +117,7 @@ func parseCmdline(logger *log.Logger, path string) (*cmdlineOpts, error) { + value := parts[1] + + switch key { +- case flagUrl: ++ case flagUrl, flagUrlLegacy, flagUrlLegacyCoreOS: + if value == "" { + logger.Info("url flag found but no value provided") + continue +-- +2.55.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-provider-qemu-apply-fw_cfg-patch.patch similarity index 81% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-provider-qemu-apply-fw_cfg-patch.patch index 1350c4bdbd8..452192f6ec0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-provider-qemu-apply-fw_cfg-patch.patch @@ -1,44 +1,42 @@ -From 5c38c01e21c6616c4a1e78b35e2f0764cbbd1b94 Mon Sep 17 00:00:00 2001 +From 7678ef605609f94b5e6e41aca95efbae8424d2d5 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 20 Aug 2026 15:11:57 +0200 -Subject: [PATCH 07/19] provider/qemu: apply fw_cfg patch +Subject: [PATCH 05/15] provider/qemu: apply fw_cfg patch we support both CoreOS and Flatcar fw_cfg path to ensure compatiblity Signed-off-by: Mathieu Tortuyaux --- - internal/providers/qemu/qemu_fwcfg.go | 138 ++++++++++++++------------ - 1 file changed, 72 insertions(+), 66 deletions(-) + internal/providers/qemu/qemu_fwcfg.go | 132 ++++++++++++++------------ + 1 file changed, 69 insertions(+), 63 deletions(-) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index a0b25902..3fc04aa3 100644 +index 4014876d..b467bd4b 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go @@ -28,6 +28,7 @@ import ( "strings" "time" -+ iErrors "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - "github.com/flatcar/ignition/v2/internal/distro" - "github.com/flatcar/ignition/v2/internal/platform" -@@ -37,10 +38,12 @@ import ( ++ iErrors "github.com/coreos/ignition/v2/config/shared/errors" + "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/coreos/ignition/v2/internal/distro" + "github.com/coreos/ignition/v2/internal/platform" +@@ -37,9 +38,11 @@ import ( "github.com/coreos/vcontext/report" ) -const ( - firmwareConfigPath = "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/raw" - firmwareConfigSizePath = "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/size" --) +var ( + firmwareConfigPaths = map[string]string{ + "/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar-linux/config/raw": "/sys/firmware/qemu_fw_cfg/by_name/opt/org.flatcar-linux/config/size", + "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/raw": "/sys/firmware/qemu_fw_cfg/by_name/opt/com.coreos/config/size", + } -+) + ) func init() { - platform.Register(platform.Provider{ @@ -57,72 +60,75 @@ func fetchConfig(f *resource.Fetcher) (cfg types.Config, rpt report.Report, err } } @@ -60,7 +58,24 @@ index a0b25902..3fc04aa3 100644 - f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) - return - } -- ++ for cfgPath, sizePath := range firmwareConfigPaths { ++ // get size of firmware blob, if it exists ++ var sizeBytes []byte ++ sizeBytes, err = os.ReadFile(sizePath) ++ if os.IsNotExist(err) { ++ f.Logger.Info("QEMU firmware config was not found. Ignoring...") ++ continue ++ } else if err != nil { ++ f.Logger.Err("couldn't read QEMU firmware config size: %v", err) ++ return ++ } ++ var size int ++ size, err = strconv.Atoi(strings.TrimSpace(string(sizeBytes))) ++ if err != nil { ++ f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) ++ return ++ } + - // Read firmware blob. We need to make as few, large read() calls as - // possible, since the qemu_fw_cfg kernel module takes O(offset) - // time for each read syscall. os.ReadFile() would eventually @@ -84,24 +99,6 @@ index a0b25902..3fc04aa3 100644 - // where it would return io.EOF - var n int - n, err = fh.Read(data[len(data):cap(data)]) -+ for cfgPath, sizePath := range firmwareConfigPaths { -+ // get size of firmware blob, if it exists -+ var sizeBytes []byte -+ sizeBytes, err = os.ReadFile(sizePath) -+ if os.IsNotExist(err) { -+ f.Logger.Info("QEMU firmware config was not found. Ignoring...") -+ continue -+ } else if err != nil { -+ f.Logger.Err("couldn't read QEMU firmware config size: %v", err) -+ return -+ } -+ var size int -+ size, err = strconv.Atoi(strings.TrimSpace(string(sizeBytes))) -+ if err != nil { -+ f.Logger.Err("couldn't parse QEMU firmware config size: %v", err) -+ return -+ } -+ + // Read firmware blob. We need to make as few, large read() calls as + // possible, since the qemu_fw_cfg kernel module takes O(offset) + // time for each read syscall. os.ReadFile() would eventually @@ -173,10 +170,9 @@ index a0b25902..3fc04aa3 100644 - // of the file so the extra read would be maximally expensive. - cfg, rpt, err = util.ParseConfig(f.Logger, data) - return --} -+ return types.Config{}, report.Report{}, iErrors.ErrEmpty -+ -+ } ++ return types.Config{}, report.Report{}, iErrors.ErrEmpty ++ + } -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index 3e5b89797a7..efc1b9c4330 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,7 +1,7 @@ -From b3d28f4138837555b62bf00d9124189b9fba29fd Mon Sep 17 00:00:00 2001 +From 7ea9a5080f23361ee6ddd469ad3e16e59f010aca Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 -Subject: [PATCH 08/19] internal/disk/fs: ignore fs format mismatches for the +Subject: [PATCH 06/15] internal/disk/fs: ignore fs format mismatches for the OEM partition As soon as the OEM partition's filesystem format changes, all users @@ -22,10 +22,10 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go -index 28a931d6..2114e713 100644 +index 4b5dd1bb..cf880f54 100644 --- a/internal/exec/stages/disks/filesystems.go +++ b/internal/exec/stages/disks/filesystems.go -@@ -126,7 +126,7 @@ func (s stage) createFilesystem(fs types.Filesystem) error { +@@ -128,7 +128,7 @@ func (s stage) createFilesystem(fs types.Filesystem) error { } // If the filesystem isn't forcefully being created, then we need // to check if it is of the correct type or that no filesystem exists. @@ -35,5 +35,5 @@ index 28a931d6..2114e713 100644 (fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) { s.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device) -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch deleted file mode 100644 index a6ec15f8ca8..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patch.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cbb7198259089a4be64ed3b452d05dda114e3b1c Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Mon, 19 Feb 2024 18:12:22 +0100 -Subject: [PATCH 06/19] internal/prv/cmdline: backport flatcar patch - -this patch provides backward compatibility for various config -key - -Signed-off-by: Mathieu Tortuyaux ---- - internal/providers/cmdline/cmdline.go | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index ad5a8426..d7a164a9 100644 ---- a/internal/providers/cmdline/cmdline.go -+++ b/internal/providers/cmdline/cmdline.go -@@ -33,7 +33,9 @@ import ( - ) - - const ( -- cmdlineUrlFlag = "ignition.config.url" -+ cmdlineUrlFlagLegacyCoreOS = "coreos.config.url" -+ cmdlineUrlFlagLegacy = "flatcar.config.url" -+ cmdlineUrlFlag = "ignition.config.url" - ) - - var ( -@@ -91,7 +93,7 @@ func parseCmdline(cmdline []byte) (url string) { - parts := strings.SplitN(strings.TrimSpace(arg), "=", 2) - key := parts[0] - -- if key != cmdlineUrlFlag { -+ if !(key == cmdlineUrlFlagLegacy || key == cmdlineUrlFlagLegacyCoreOS || key == cmdlineUrlFlag) { - continue - } - --- -2.54.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index 97dc475a2cd..58173b9b431 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,7 +1,7 @@ -From 7b7a299eb4304b156f5fe74d6a01e2ffd8879df4 Mon Sep 17 00:00:00 2001 +From 98d31c4c7fb9a47955e0128eb42e0ac131392058 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:12:02 +0100 -Subject: [PATCH 09/19] VMware: Fix guestinfo.*.config.data and *.config.url +Subject: [PATCH 07/15] VMware: Fix guestinfo.*.config.data and *.config.url variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -26,7 +26,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 71 insertions(+), 22 deletions(-) diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index e6fd09c6..a485b97b 100644 +index 08569249..07acf84f 100644 --- a/internal/providers/vmware/vmware_amd64.go +++ b/internal/providers/vmware/vmware_amd64.go @@ -19,6 +19,7 @@ package vmware @@ -35,8 +35,8 @@ index e6fd09c6..a485b97b 100644 "fmt" + "net/url" - "github.com/flatcar/ignition/v2/config/v3_7_experimental/types" - "github.com/flatcar/ignition/v2/internal/platform" + "github.com/coreos/ignition/v2/config/v3_7_experimental/types" + "github.com/coreos/ignition/v2/internal/platform" @@ -58,26 +59,83 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { return types.Config{}, report.Report{}, platform.ErrNoProvider } @@ -164,5 +164,5 @@ index e6fd09c6..a485b97b 100644 func delConfig(f *resource.Fetcher) error { -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-version-handle-configuration-version-1.patch similarity index 86% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-config-version-handle-configuration-version-1.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-version-handle-configuration-version-1.patch index 0c89297d7a1..c68bc11e85d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-config-version-handle-configuration-version-1.patch @@ -1,7 +1,7 @@ -From 6e16eb458d8c7a9d7804832aa37a0a8dceb20de5 Mon Sep 17 00:00:00 2001 +From 53ef77a20decae34e311708cb49c31d4a1cfd03e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 -Subject: [PATCH 10/19] config/version: handle configuration version 1 +Subject: [PATCH 08/15] config/version: handle configuration version 1 version 2 should be able to translate configuration version 1 but the `GetConfigVersion` was not able to detect version 1 configuration since for this particular @@ -13,7 +13,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/util/config.go b/config/util/config.go -index 3b9bb22f..f81056fa 100644 +index 0b676698..b865a5e8 100644 --- a/config/util/config.go +++ b/config/util/config.go @@ -15,6 +15,8 @@ @@ -22,7 +22,7 @@ index 3b9bb22f..f81056fa 100644 import ( + "strconv" + - "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/coreos/ignition/v2/config/shared/errors" "github.com/coreos/go-semver/semver" @@ -25,6 +27,7 @@ type versionStub struct { @@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644 return semver.Version{}, report.Report{}, errors.ErrInvalidVersion } -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-util-add-cloud-init-detection-to-initial-pars.patch similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-util-add-cloud-init-detection-to-initial-pars.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-util-add-cloud-init-detection-to-initial-pars.patch index ad36b28e46d..71d81222fcd 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,7 +1,7 @@ -From 24ebb8d1b0ed9b33343666f1c674ac6fd3ca9248 Mon Sep 17 00:00:00 2001 +From 098a5be89077eeb510f3b1a64e74a5f9ba8a9081 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 -Subject: [PATCH 11/19] config/util: add cloud init detection to initial +Subject: [PATCH 09/15] config/util: add cloud init detection to initial parsing we detect if the config is not an ignition one (script/cloudinit) and we @@ -14,7 +14,7 @@ Signed-off-by: Gabriel Adrian Samfira 1 file changed, 53 insertions(+) diff --git a/config/util/parsingErrors.go b/config/util/parsingErrors.go -index 865d75d2..313d42ea 100644 +index 2af85e2b..10af2729 100644 --- a/config/util/parsingErrors.go +++ b/config/util/parsingErrors.go @@ -15,7 +15,14 @@ @@ -30,7 +30,7 @@ index 865d75d2..313d42ea 100644 + "strings" + "unicode" - "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/coreos/ignition/v2/config/shared/errors" @@ -24,10 +31,56 @@ import ( "github.com/coreos/vcontext/tree" @@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644 if err == nil { return report.Report{}, nil -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-translation-support-OEM-and-oem.patch similarity index 80% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-translation-support-OEM-and-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-translation-support-OEM-and-oem.patch index 50455e4794a..9cd6e8d5e67 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-translation-support-OEM-and-oem.patch @@ -1,36 +1,27 @@ -From 820949eec50518f34b528082b34acc732ac2763f Mon Sep 17 00:00:00 2001 +From 53af65c1f108785d61aff862ff8978220d41d3a4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 -Subject: [PATCH 14/19] translation: support OEM and oem +Subject: [PATCH 10/15] translation: support OEM and oem Signed-off-by: Mathieu Tortuyaux --- - config/v24tov31/v24tov31.go | 6 +- + config/v24tov31/v24tov31.go | 3 +- config/v24tov31/v24tov31_test.go | 109 +++++++++++++++++++++++++++++++ - 2 files changed, 112 insertions(+), 3 deletions(-) + 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/config/v24tov31/v24tov31.go b/config/v24tov31/v24tov31.go -index 46749385..68da4014 100644 +index dd8d2d00..6749a912 100644 --- a/config/v24tov31/v24tov31.go +++ b/config/v24tov31/v24tov31.go -@@ -21,14 +21,14 @@ import ( +@@ -21,6 +21,7 @@ import ( "path" "path/filepath" "reflect" + "strings" - old "github.com/flatcar/ignition/config/v2_4/types" - oldValidate "github.com/flatcar/ignition/config/validate" - "github.com/flatcar/ignition/v2/config/merge" -+ "github.com/flatcar/ignition/v2/config/util" - "github.com/flatcar/ignition/v2/config/v3_1/types" - "github.com/flatcar/ignition/v2/config/validate" -- "github.com/flatcar/ignition/v2/config/util" -- - ) - - // Check2_4 returns if the config is translatable but does not do any translation. -@@ -474,7 +474,7 @@ func translateFilesystems(fss []old.Filesystem, m map[string]string) (ret []type + old "github.com/coreos/ignition/config/v2_4/types" + oldValidate "github.com/coreos/ignition/config/validate" +@@ -473,7 +474,7 @@ func translateFilesystems(fss []old.Filesystem, m map[string]string) (ret []type } format := f.Mount.Format @@ -40,7 +31,7 @@ index 46749385..68da4014 100644 } diff --git a/config/v24tov31/v24tov31_test.go b/config/v24tov31/v24tov31_test.go -index e81f6bed..68c07109 100644 +index 17f7c00c..abc7801d 100644 --- a/config/v24tov31/v24tov31_test.go +++ b/config/v24tov31/v24tov31_test.go @@ -1690,3 +1690,112 @@ func TestDuplicateUnits(t *testing.T) { @@ -157,5 +148,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-internal-exec-stages-mount-Mount-oem.patch similarity index 88% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-mount-Mount-oem.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-internal-exec-stages-mount-Mount-oem.patch index de938fdcd80..0ba3a7b80e0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-mount-Mount-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-internal-exec-stages-mount-Mount-oem.patch @@ -1,7 +1,7 @@ -From c6a9a9fdfe8a60fd885d2a76611e0e0d2beedfbc Mon Sep 17 00:00:00 2001 +From f680d14d8d0174ae2f1967acd04098445501a46e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 -Subject: [PATCH 16/19] internal/exec/stages/mount: Mount /oem +Subject: [PATCH 11/15] internal/exec/stages/mount: Mount /oem When asking to mount the OEM partition to /usr/share/oem, actually mount it in /oem. The /usr/share/oem is a symlink pointing to /oem, so @@ -12,7 +12,7 @@ into /usr/share/oem, should end up having things in /oem. 1 file changed, 5 insertions(+) diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go -index bc0bf534..f9f8dcaa 100644 +index a5aa1f8b..cad521f3 100644 --- a/internal/exec/stages/mount/mount.go +++ b/internal/exec/stages/mount/mount.go @@ -118,6 +118,11 @@ func (s stage) mountFs(fs types.Filesystem) error { @@ -28,5 +28,5 @@ index bc0bf534..f9f8dcaa 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.54.0 +2.55.0 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/0012-go-mod-vendor.patch similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-go-mod-vendor.patch index 7ed6af4c7fa..054f7fa1c1d 100644 --- 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/0012-go-mod-vendor.patch @@ -1,9 +1,9 @@ -From 6357e8465cd9dc5a008fb45a8505ba628924df81 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Thu, 20 Aug 2026 14:24:00 +0200 -Subject: [PATCH 05/19] vendor: go mod vendor +From d9a2c83900a0d66021dfe69bbf00c625287a6437 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Thu, 3 Sep 2026 15:00:47 +0100 +Subject: [PATCH 12/15] go mod vendor -Signed-off-by: Mathieu Tortuyaux +Signed-off-by: James Le Cuirot --- vendor/github.com/ajeddeloh/go-json/README | 10 + vendor/github.com/ajeddeloh/go-json/decode.go | 1226 +++++++++++++++++ @@ -17029,33 +17029,33 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 36c02885..a36e3fa1 100644 +index 4cd3527f..4b1f9e9e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt -@@ -132,6 +132,9 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric - # github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 - ## explicit; go 1.24.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping +@@ -76,6 +76,9 @@ github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared + github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/version + github.com/AzureAD/microsoft-authentication-library-for-go/apps/managedidentity + github.com/AzureAD/microsoft-authentication-library-for-go/apps/public +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 +## explicit +github.com/ajeddeloh/go-json - # github.com/aws/aws-sdk-go-v2 v1.41.1 - ## explicit; go 1.23 + # github.com/aws/aws-sdk-go-v2 v1.43.4 + ## explicit; go 1.24 github.com/aws/aws-sdk-go-v2/aws -@@ -255,6 +258,9 @@ github.com/coreos/go-json +@@ -191,6 +194,9 @@ github.com/coreos/go-json # github.com/coreos/go-semver v0.3.1 ## explicit; go 1.8 github.com/coreos/go-semver/semver +# github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 +## explicit +github.com/coreos/go-systemd/unit - # github.com/coreos/go-systemd/v22 v22.6.0 + # github.com/coreos/go-systemd/v22 v22.7.0 ## explicit; go 1.23 github.com/coreos/go-systemd/v22/dbus -@@ -316,6 +322,27 @@ github.com/envoyproxy/protoc-gen-validate/validate - # github.com/felixge/httpsnoop v1.0.4 - ## explicit; go 1.13 - github.com/felixge/httpsnoop +@@ -207,6 +213,27 @@ github.com/coreos/vcontext/yaml + # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc + ## explicit + github.com/davecgh/go-spew/spew +# github.com/flatcar/ignition v0.36.2 +## explicit; go 1.16 +github.com/flatcar/ignition/config/shared/errors @@ -17077,19 +17077,19 @@ index 36c02885..a36e3fa1 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-jose/go-jose/v4 v4.1.3 - ## explicit; go 1.24.0 - github.com/go-jose/go-jose/v4 -@@ -496,6 +523,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 + # github.com/godbus/dbus/v5 v5.1.0 + ## explicit; go 1.12 + github.com/godbus/dbus/v5 +@@ -264,6 +291,9 @@ github.com/vmware/vmw-guestinfo/message + github.com/vmware/vmw-guestinfo/rpcout + github.com/vmware/vmw-guestinfo/rpcvmx + github.com/vmware/vmw-guestinfo/vmcheck +# go4.org v0.0.0-20160314031811-03efcb870d84 +## explicit +go4.org/errorutil - # golang.org/x/crypto v0.47.0 - ## explicit; go 1.24.0 - golang.org/x/crypto/chacha20 + # golang.org/x/crypto v0.54.0 + ## explicit; go 1.25.0 + golang.org/x/crypto/pkcs12 -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-Partially-revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Partially-revert-drop-OEM-URI-support.patch similarity index 72% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-Partially-revert-drop-OEM-URI-support.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Partially-revert-drop-OEM-URI-support.patch index e3ade4b11cc..e3c1fe8eba1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-Partially-revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Partially-revert-drop-OEM-URI-support.patch @@ -1,7 +1,7 @@ -From 3a322043816015861d66d416822ef273c0919012 Mon Sep 17 00:00:00 2001 +From 1c4a140b210d2a6480f43cf1a65d7ff58bf51f69 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 1 Apr 2026 16:11:52 +0100 -Subject: [PATCH 12/19] Partially revert "*: drop OEM URI support" +Subject: [PATCH 13/15] Partially revert "*: drop OEM URI support" This partially reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. @@ -12,12 +12,12 @@ Signed-off-by: James Le Cuirot config/v3_2/types/url.go | 2 +- config/v3_3/types/url.go | 2 +- config/v3_4/types/url.go | 2 +- - internal/distro/distro.go | 3 +++ - internal/resource/url.go | 29 ++++++++++++++++++++++++++++- - 7 files changed, 36 insertions(+), 6 deletions(-) + internal/distro/distro.go | 4 ++++ + internal/resource/url.go | 27 +++++++++++++++++++++++++++ + 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go -index 2d8c44b1..f560bc22 100644 +index 6a1f9397..a18e49dc 100644 --- a/config/v3_0/types/url.go +++ b/config/v3_0/types/url.go @@ -30,7 +30,7 @@ func validateURL(s string) error { @@ -30,7 +30,7 @@ index 2d8c44b1..f560bc22 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_1/types/url.go b/config/v3_1/types/url.go -index 2d8c44b1..f560bc22 100644 +index 6a1f9397..a18e49dc 100644 --- a/config/v3_1/types/url.go +++ b/config/v3_1/types/url.go @@ -30,7 +30,7 @@ func validateURL(s string) error { @@ -43,7 +43,7 @@ index 2d8c44b1..f560bc22 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_2/types/url.go b/config/v3_2/types/url.go -index bf1f3a5e..63297beb 100644 +index 0d8771bf..5020bf7e 100644 --- a/config/v3_2/types/url.go +++ b/config/v3_2/types/url.go @@ -30,7 +30,7 @@ func validateURL(s string) error { @@ -56,7 +56,7 @@ index bf1f3a5e..63297beb 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_3/types/url.go b/config/v3_3/types/url.go -index bf1f3a5e..63297beb 100644 +index 0d8771bf..5020bf7e 100644 --- a/config/v3_3/types/url.go +++ b/config/v3_3/types/url.go @@ -30,7 +30,7 @@ func validateURL(s string) error { @@ -69,7 +69,7 @@ index bf1f3a5e..63297beb 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_4/types/url.go b/config/v3_4/types/url.go -index b1f96337..752044ce 100644 +index 97a4c9ae..7bcad990 100644 --- a/config/v3_4/types/url.go +++ b/config/v3_4/types/url.go @@ -32,7 +32,7 @@ func validateURL(s string) error { @@ -82,31 +82,32 @@ index b1f96337..752044ce 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 235882d5..98d0625d 100644 +index 5e03425b..7bdb284d 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go -@@ -30,6 +30,8 @@ var ( - bootIDPath = "/proc/sys/kernel/random/boot_id" - // initramfs directory containing distro-provided base config - systemConfigDir = "/usr/lib/ignition" +@@ -33,6 +33,8 @@ var ( + systemRuntimeConfigDir = "/run/ignition" + systemLocalConfigDir = "/etc/ignition" + systemConfigDir = "/usr/lib/ignition" + // initramfs directory to check before retrieving file from OEM partition + oemLookasideDir = "/usr/share/oem" // Helper programs groupaddCmd = "groupadd" -@@ -89,6 +91,7 @@ func DiskByLabelDir() string { return diskByLabelDir } - func KernelCmdlinePath() string { return kernelCmdlinePath } - func BootIDPath() string { return bootIDPath } - func SystemConfigDir() string { return fromEnv("SYSTEM_CONFIG_DIR", systemConfigDir) } -+func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasideDir) } +@@ -107,6 +109,8 @@ func SystemConfigDirs() []string { + } + } ++func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasideDir) } ++ func GroupaddCmd() string { return groupaddCmd } func GroupmodCmd() string { return groupmodCmd } + func GroupdelCmd() string { return groupdelCmd } diff --git a/internal/resource/url.go b/internal/resource/url.go -index 8d00d823..10af133b 100644 +index 6fe693a6..f1eb2787 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -28,6 +28,7 @@ import ( +@@ -28,12 +28,14 @@ import ( "net/netip" "net/url" "os" @@ -114,20 +115,14 @@ index 8d00d823..10af133b 100644 "strings" "sync" "syscall" -@@ -35,10 +36,11 @@ import ( "cloud.google.com/go/compute/metadata" - "cloud.google.com/go/storage" -+ "github.com/coreos/vcontext/report" - configErrors "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/internal/distro" - "github.com/flatcar/ignition/v2/internal/log" - "github.com/flatcar/ignition/v2/internal/util" -- "github.com/coreos/vcontext/report" - "golang.org/x/oauth2/google" - "google.golang.org/api/option" - -@@ -176,6 +178,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { + configErrors "github.com/coreos/ignition/v2/config/shared/errors" ++ "github.com/coreos/ignition/v2/internal/distro" + "github.com/coreos/ignition/v2/internal/log" + "github.com/coreos/ignition/v2/internal/util" + "github.com/coreos/vcontext/report" +@@ -175,6 +177,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { err = f.fetchFromTFTP(u, dest, opts) case "data": err = f.fetchFromDataURL(u, dest, opts) @@ -136,7 +131,7 @@ index 8d00d823..10af133b 100644 case "s3", "arn": buf := &s3buf{ WriteAtBuffer: manager.NewWriteAtBuffer([]byte{}), -@@ -248,6 +252,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { +@@ -247,6 +251,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { return f.fetchFromTFTP(u, dest, opts) case "data": return f.fetchFromDataURL(u, dest, opts) @@ -145,7 +140,7 @@ index 8d00d823..10af133b 100644 case "s3", "arn": return f.fetchFromS3(u, dest, opts) case "gs": -@@ -465,6 +471,27 @@ type s3target interface { +@@ -464,6 +470,27 @@ type s3target interface { io.ReadSeeker } @@ -174,5 +169,5 @@ index 8d00d823..10af133b 100644 // dest, returning an error if one is encountered. It will attempt to acquire // IAM credentials from the EC2 metadata service, and if this fails will attempt -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch similarity index 87% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch index f1fcde867ee..d0cddf82f56 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch @@ -1,7 +1,7 @@ -From 4cb701db0bcf6e315a9b83ffac2acf0ab8daa03c Mon Sep 17 00:00:00 2001 +From 691dfae5bebac72a36b99e6cbfca5a5f43741d64 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 6 Apr 2026 13:13:58 +0100 -Subject: [PATCH 13/19] config: Support oem:// schema in newer config spec +Subject: [PATCH 14/15] config: Support oem:// schema in newer config spec versions Signed-off-by: James Le Cuirot @@ -13,7 +13,7 @@ Signed-off-by: Mathieu Tortuyaux 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/v3_5/types/url.go b/config/v3_5/types/url.go -index b1f96337..752044ce 100644 +index 97a4c9ae..7bcad990 100644 --- a/config/v3_5/types/url.go +++ b/config/v3_5/types/url.go @@ -32,7 +32,7 @@ func validateURL(s string) error { @@ -26,7 +26,7 @@ index b1f96337..752044ce 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_6/types/url.go b/config/v3_6/types/url.go -index b1f96337..752044ce 100644 +index 97a4c9ae..7bcad990 100644 --- a/config/v3_6/types/url.go +++ b/config/v3_6/types/url.go @@ -32,7 +32,7 @@ func validateURL(s string) error { @@ -39,7 +39,7 @@ index b1f96337..752044ce 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/config/v3_7_experimental/types/url.go b/config/v3_7_experimental/types/url.go -index b1f96337..752044ce 100644 +index 97a4c9ae..7bcad990 100644 --- a/config/v3_7_experimental/types/url.go +++ b/config/v3_7_experimental/types/url.go @@ -32,7 +32,7 @@ func validateURL(s string) error { @@ -52,5 +52,5 @@ index b1f96337..752044ce 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch index bbde24fe943..5a279c8eb44 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-usr-share-oem-oem.patch @@ -1,7 +1,7 @@ -From becd01b0e801430a97a9abb82ec984b1af32d110 Mon Sep 17 00:00:00 2001 +From 62e22b4b62eadddeda74a8bdc5df30d753345aea Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 25 Mar 2026 10:55:24 +0000 -Subject: [PATCH 15/19] /usr/share/oem -> /oem +Subject: [PATCH 15/15] /usr/share/oem -> /oem Flatcar previously kept looking at the initrd's /usr/share/oem even after the migration for compatibility, but the minimal initrd now moves @@ -27,12 +27,12 @@ index 347d148c..d4c057b2 100644 // generate a new path fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10) diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 98d0625d..a970ef17 100644 +index 7bdb284d..0602325e 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go -@@ -31,7 +31,7 @@ var ( - // initramfs directory containing distro-provided base config - systemConfigDir = "/usr/lib/ignition" +@@ -34,7 +34,7 @@ var ( + systemLocalConfigDir = "/etc/ignition" + systemConfigDir = "/usr/lib/ignition" // initramfs directory to check before retrieving file from OEM partition - oemLookasideDir = "/usr/share/oem" + oemLookasideDir = "/oem" @@ -40,5 +40,5 @@ index 98d0625d..a970ef17 100644 // Helper programs groupaddCmd = "groupadd" -- -2.54.0 +2.55.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch deleted file mode 100644 index 7ddd978959a..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 15178ee5bc94c1e98e51ebf32d2db8d9c671249e Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Thu, 11 Jun 2026 23:03:00 +0100 -Subject: [PATCH 17/19] stages/disks: Fix handling of device mapper when - partitioning - -It was handled correctly when checking whether the whole disk was in use -but not when checking individual partitions. - -Signed-off-by: James Le Cuirot ---- - internal/exec/stages/disks/partitions.go | 63 +++++++++++++++++++----- - 1 file changed, 50 insertions(+), 13 deletions(-) - -diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index c20e4875..f68d6dad 100644 ---- a/internal/exec/stages/disks/partitions.go -+++ b/internal/exec/stages/disks/partitions.go -@@ -323,11 +323,15 @@ func (p PartitionList) Swap(i, j int) { - p[i], p[j] = p[j], p[i] - } - --func isBlockDevMapper(blockDevResolved string) bool { -+// blockDevDMName returns the device mapper name for the given block device, -+// or an empty string if it is not a device mapper device. -+func blockDevDMName(blockDevResolved string) string { - blockDevNode := filepath.Base(blockDevResolved) -- dmName := fmt.Sprintf("/sys/class/block/%s/dm/name", blockDevNode) -- _, err := os.Stat(dmName) -- return err == nil -+ dmNameBytes, err := os.ReadFile(fmt.Sprintf("/sys/class/block/%s/dm/name", blockDevNode)) -+ if err != nil { -+ return "" -+ } -+ return strings.TrimSpace(string(dmNameBytes)) - } - - // Expects a /dev/xyz path -@@ -368,8 +372,23 @@ func blockDevMounted(blockDevResolved string) (bool, error) { - } - - // Expects a /dev/xyz path --func blockDevPartitions(blockDevResolved string) ([]string, error) { -- _, blockDevNode := filepath.Split(blockDevResolved) -+func blockDevPartitions(blockDevResolved string, dmName string) ([]string, error) { -+ blockDevNode := filepath.Base(blockDevResolved) -+ -+ if dmName != "" { -+ // For device mapper (e.g. multipath), partition devices are -+ // separate DM nodes. Find them via dm-name symlinks. -+ matches, _ := filepath.Glob(fmt.Sprintf("/dev/disk/by-id/dm-name-%sp[0-9]*", dmName)) -+ var partitions []string -+ for _, m := range matches { -+ resolved, err := filepath.EvalSymlinks(m) -+ if err != nil { -+ return nil, fmt.Errorf("failed to resolve %q: %v", m, err) -+ } -+ partitions = append(partitions, resolved) -+ } -+ return partitions, nil -+ } - - // This also works for extended MBR partitions - sysDir := fmt.Sprintf("/sys/class/block/%s/", blockDevNode) -@@ -388,12 +407,11 @@ func blockDevPartitions(blockDevResolved string) ([]string, error) { - } - - // Expects a /dev/xyz path --func blockDevInUse(blockDevResolved string, skipPartitionCheck bool) (bool, []string, error) { -+func blockDevInUse(blockDevResolved string, dmName string, skipPartitionCheck bool) (bool, []string, error) { - // Note: This ignores swap and LVM usage - inUse := false -- isDevMapper := isBlockDevMapper(blockDevResolved) - held := false -- if !isDevMapper { -+ if dmName == "" { - var err error - held, err = blockDevHeld(blockDevResolved) - if err != nil { -@@ -408,13 +426,13 @@ func blockDevInUse(blockDevResolved string, skipPartitionCheck bool) (bool, []st - if skipPartitionCheck { - return inUse, nil, nil - } -- partitions, err := blockDevPartitions(blockDevResolved) -+ partitions, err := blockDevPartitions(blockDevResolved, dmName) - if err != nil { - return false, nil, fmt.Errorf("failed to retrieve partitions of %q: %v", blockDevResolved, err) - } - var activePartitions []string - for _, partition := range partitions { -- partInUse, _, err := blockDevInUse(partition, true) -+ partInUse, _, err := blockDevInUse(partition, dmName, true) - if err != nil { - return false, nil, fmt.Errorf("failed to check if partition %q is in use: %v", partition, err) - } -@@ -435,6 +453,18 @@ func partitionNumberPrefix(blockDevResolved string) string { - return "" - } - -+// partitionDevPath returns the expected device path for the given partition -+// number on the given disk. For device mapper devices (e.g. multipath), the -+// partition devices are separate DM nodes, so we locate them via -+// /dev/disk/by-id/dm-name-p symlinks. The returned path may or may -+// not exist on disk. -+func partitionDevPath(blockDevResolved string, dmName string, prefix string, partNum int) string { -+ if dmName == "" { -+ return fmt.Sprintf("%s%s%d", blockDevResolved, prefix, partNum) -+ } -+ return fmt.Sprintf("/dev/disk/by-id/dm-name-%sp%d", dmName, partNum) -+} -+ - // partitionDisk partitions devAlias according to the spec given by dev - func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - blockDevResolved, err := filepath.EvalSymlinks(devAlias) -@@ -442,7 +472,9 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - return fmt.Errorf("failed to resolve %q: %v", devAlias, err) - } - -- inUse, activeParts, err := blockDevInUse(blockDevResolved, false) -+ dmName := blockDevDMName(blockDevResolved) -+ -+ inUse, activeParts, err := blockDevInUse(blockDevResolved, dmName, false) - if err != nil { - return fmt.Errorf("failed usage check on %q: %v", devAlias, err) - } -@@ -499,7 +531,12 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - } - matches := exists && matchErr == nil - wipeEntry := cutil.IsTrue(part.WipePartitionEntry) -- partInUse := iutil.StrSliceContains(activeParts, fmt.Sprintf("%s%s%d", blockDevResolved, prefix, part.Number)) -+ -+ partDevForCheck := partitionDevPath(blockDevResolved, dmName, prefix, part.Number) -+ if resolved, err := filepath.EvalSymlinks(partDevForCheck); err == nil { -+ partDevForCheck = resolved -+ } -+ partInUse := iutil.StrSliceContains(activeParts, partDevForCheck) - - var modification bool - --- -2.54.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch deleted file mode 100644 index e13b7dc051e..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 1fc41c5464381fd487492bf2cb13ab375ca2ed39 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Tue, 2 Jun 2026 15:12:37 +0100 -Subject: [PATCH 18/19] stages/disks: Fix giving partition number 0 to get the - next available - -This was broken since partx was used in commit c2cc56cd. Passing 0 to -partx causes it to try and add all the partitions, which will almost -always fail because the kernel will usually already know about at least -some of them. - -This changes getRealStartAndSize() to also determine and return the -resulting partition numbers so that subsequent operations use these -instead of 0. - -sgdisk does support --new=0, but it has no way to report which partition -number it actually used. - -Signed-off-by: James Le Cuirot ---- - internal/exec/stages/disks/partitions.go | 64 ++++++++++++++---------- - 1 file changed, 37 insertions(+), 27 deletions(-) - -diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index f68d6dad..3b92a461 100644 ---- a/internal/exec/stages/disks/partitions.go -+++ b/internal/exec/stages/disks/partitions.go -@@ -112,15 +112,6 @@ func partitionMatchesCommon(existing util.PartitionInfo, spec sgdisk.Partition) - return nil - } - --// partitionShouldBeInspected returns if the partition has zeroes that need to be resolved to sectors. --func partitionShouldBeInspected(part sgdisk.Partition) bool { -- if part.Number == 0 { -- return false -- } -- return (part.StartSector != nil && *part.StartSector == 0) || -- (part.SizeInSectors != nil && *part.SizeInSectors == 0) --} -- - func convertMiBToSectors(mib *int, sectorSize int) *int64 { - if mib != nil { - v := int64(*mib) * (1024 * 1024 / int64(sectorSize)) -@@ -130,10 +121,17 @@ func convertMiBToSectors(mib *int, sectorSize int) *int64 { - } - } - --// getRealStartAndSize returns a map of partition numbers to a struct that contains what their real start --// and end sector should be. It runs sgdisk --pretend to determine what the partitions would look like if --// everything specified were to be (re)created. -+// getRealStartAndSize returns a copy of the given partition configuration with the real partition -+// numbers, start sectors, and end sectors filled in. It runs sgdisk --pretend to determine what the -+// partitions would look like if everything specified were to be (re)created. - func (s stage) getRealStartAndSize(dev types.Disk, devAlias string, diskInfo util.DiskInfo) ([]sgdisk.Partition, error) { -+ used := map[int]bool{} -+ -+ // Determine which partition numbers are already used. -+ for _, part := range diskInfo.Partitions { -+ used[part.Number] = true -+ } -+ - partitions := []sgdisk.Partition{} - for _, cpart := range dev.Partitions { - partitions = append(partitions, sgdisk.Partition{ -@@ -156,6 +154,10 @@ func (s stage) getRealStartAndSize(dev types.Disk, devAlias string, diskInfo uti - part.SizeInSectors = &info.SizeInSectors - } - } -+ if part.Number > 0 { -+ // Mark the partition number as used or not. -+ used[part.Number] = partitionShouldExist(part) -+ } - if partitionShouldExist(part) { - // Clear the label. sgdisk doesn't escape control characters. This makes parsing easier - part.Label = nil -@@ -163,12 +165,25 @@ func (s stage) getRealStartAndSize(dev types.Disk, devAlias string, diskInfo uti - } - } - -- // We only care to examine partitions that have start or size 0. -+ free := 1 - partitionsToInspect := []int{} -- for _, part := range partitions { -- if partitionShouldBeInspected(part) { -- op.Info(part.Number) -- partitionsToInspect = append(partitionsToInspect, part.Number) -+ for i := range partitions { -+ part := &partitions[i] -+ if partitionShouldExist(*part) { -+ // Find the next free partition number and use it. -+ if part.Number == 0 { -+ for used[free] { -+ free++ -+ } -+ part.Number = free -+ free++ -+ } -+ // We only care to examine partitions that have start or size 0. -+ if part.StartSector == nil || *part.StartSector == 0 || -+ part.SizeInSectors == nil || *part.SizeInSectors == 0 { -+ op.Info(part.Number) -+ partitionsToInspect = append(partitionsToInspect, part.Number) -+ } - } - } - -@@ -182,19 +197,14 @@ func (s stage) getRealStartAndSize(dev types.Disk, devAlias string, diskInfo uti - return nil, err - } - -- result := []sgdisk.Partition{} -- for _, part := range partitions { -+ for i := range partitions { -+ part := &partitions[i] - if dims, ok := realDimensions[part.Number]; ok { -- if part.StartSector != nil { -- part.StartSector = &dims.start -- } -- if part.SizeInSectors != nil { -- part.SizeInSectors = &dims.size -- } -+ part.StartSector = &dims.start -+ part.SizeInSectors = &dims.size - } -- result = append(result, part) - } -- return result, nil -+ return partitions, nil - } - - type sgdiskOutput struct { --- -2.54.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch deleted file mode 100644 index b90ad777975..00000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch +++ /dev/null @@ -1,255 +0,0 @@ -From a7a5457de9039ae7313298a4b1e6756f6b43d5b5 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Fri, 8 May 2026 17:58:38 +0100 -Subject: [PATCH 19/19] stages/disks: Allow partx to fail then check the state - later - -`partx --add` will fail if the kernel is already aware of the new -partition. It was always theoretically possible that udev might trigger -early, and that appears to be happening now. - -Allow partx to fail and then check that added/updated partitions have -the right start sector and size and that deleted partitions are absent -once udev has settled. - -Now that partx can safely fail, we can run it unconditionally instead of -just when partitions on the disk were active. It seems best to run it -just in case. - -Signed-off-by: James Le Cuirot ---- - internal/distro/distro.go | 2 + - internal/exec/stages/disks/partitions.go | 137 +++++++++++++++++++---- - 2 files changed, 115 insertions(+), 24 deletions(-) - -diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index a970ef17..a1b63e14 100644 ---- a/internal/distro/distro.go -+++ b/internal/distro/distro.go -@@ -37,6 +37,7 @@ var ( - groupaddCmd = "groupadd" - groupmodCmd = "groupmod" - groupdelCmd = "groupdel" -+ dmsetupCmd = "dmsetup" - mdadmCmd = "mdadm" - mountCmd = "mount" - partxCmd = "partx" -@@ -96,6 +97,7 @@ func OEMLookasideDir() string { return fromEnv("OEM_LOOKASIDE_DIR", oemLookasi - func GroupaddCmd() string { return groupaddCmd } - func GroupmodCmd() string { return groupmodCmd } - func GroupdelCmd() string { return groupdelCmd } -+func DmsetupCmd() string { return dmsetupCmd } - func MdadmCmd() string { return mdadmCmd } - func MountCmd() string { return mountCmd } - func PartxCmd() string { return partxCmd } -diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go -index 3b92a461..32573295 100644 ---- a/internal/exec/stages/disks/partitions.go -+++ b/internal/exec/stages/disks/partitions.go -@@ -22,10 +22,12 @@ import ( - "bufio" - "errors" - "fmt" -+ "iter" - "os" - "os/exec" - "path/filepath" - "regexp" -+ "slices" - "sort" - "strconv" - "strings" -@@ -475,6 +477,32 @@ func partitionDevPath(blockDevResolved string, dmName string, prefix string, par - return fmt.Sprintf("/dev/disk/by-id/dm-name-%sp%d", dmName, partNum) - } - -+// dmPartitionStartAndSize returns the start sector and size (in 512-byte -+// sectors) of a device mapper partition device by parsing `dmsetup table`. -+// The table for a linear DM partition looks like: -+// -+// 0 linear -+func dmPartitionStartAndSize(partDev string) (int64, int64, error) { -+ out, err := exec.Command(distro.DmsetupCmd(), "table", partDev).Output() -+ if err != nil { -+ return 0, 0, fmt.Errorf("dmsetup table failed for %q: %v", partDev, err) -+ } -+ // Parse: "0 linear " -+ fields := strings.Fields(strings.TrimSpace(string(out))) -+ if len(fields) < 5 || fields[2] != "linear" { -+ return 0, 0, fmt.Errorf("unexpected dmsetup table output for %q: %q", partDev, string(out)) -+ } -+ size, err := strconv.ParseInt(fields[1], 10, 64) -+ if err != nil { -+ return 0, 0, fmt.Errorf("failed to parse size from dmsetup table for %q: %v", partDev, err) -+ } -+ start, err := strconv.ParseInt(fields[4], 10, 64) -+ if err != nil { -+ return 0, 0, fmt.Errorf("failed to parse start from dmsetup table for %q: %v", partDev, err) -+ } -+ return start, size, nil -+} -+ - // partitionDisk partitions devAlias according to the spec given by dev - func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - blockDevResolved, err := filepath.EvalSymlinks(devAlias) -@@ -528,9 +556,9 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - return err - } - -- var partxAdd []uint64 -- var partxDelete []uint64 -- var partxUpdate []uint64 -+ var partxAdd []int -+ var partxDelete []int -+ var partxUpdate []int - - for _, part := range resolvedPartitions { - shouldExist := partitionShouldExist(part) -@@ -557,13 +585,13 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - case !exists && shouldExist: - op.CreatePartition(part) - modification = true -- partxAdd = append(partxAdd, uint64(part.Number)) -+ partxAdd = append(partxAdd, part.Number) - case exists && !shouldExist && !wipeEntry: - return fmt.Errorf("partition %d exists but is specified as nonexistant and wipePartitionEntry is false", part.Number) - case exists && !shouldExist && wipeEntry: - op.DeletePartition(part.Number) - modification = true -- partxDelete = append(partxDelete, uint64(part.Number)) -+ partxDelete = append(partxDelete, part.Number) - case exists && shouldExist && matches: - s.Info("partition %d found with correct specifications", part.Number) - case exists && shouldExist && !wipeEntry && !matches: -@@ -577,7 +605,7 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - part.StartSector = &info.StartSector - op.CreatePartition(part) - modification = true -- partxUpdate = append(partxUpdate, uint64(part.Number)) -+ partxUpdate = append(partxUpdate, part.Number) - } else { - return fmt.Errorf("partition %d didn't match: %v", part.Number, matchErr) - } -@@ -586,7 +614,7 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - op.DeletePartition(part.Number) - op.CreatePartition(part) - modification = true -- partxUpdate = append(partxUpdate, uint64(part.Number)) -+ partxUpdate = append(partxUpdate, part.Number) - default: - // unfortunatey, golang doesn't check that all cases are handled exhaustively - return fmt.Errorf("unreachable code reached when processing partition %d. golang--", part.Number) -@@ -604,26 +632,22 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - // In contrast to similar tools, sgdisk does not trigger the update of the - // kernel partition table with BLKPG but only uses BLKRRPART which fails - // as soon as one partition of the disk is mounted -- if len(activeParts) > 0 { -- runPartxCommand := func(op string, partitions []uint64) error { -- for _, partNr := range partitions { -- cmd := exec.Command(distro.PartxCmd(), "--"+op, "--nr", strconv.FormatUint(partNr, 10), blockDevResolved) -- if _, err := s.LogCmd(cmd, "triggering partition %d %s on %q", partNr, op, devAlias); err != nil { -- return fmt.Errorf("partition %s failed: %v", op, err) -- } -+ runPartxCommand := func(op string, partitions iter.Seq[int]) { -+ for partNr := range partitions { -+ // Don't use LogCmd here because we don't want to treat failure as -+ // critical and this command will never produce anything on Stdout. -+ cmd := exec.Command(distro.PartxCmd(), "--"+op, "--nr", fmt.Sprint(partNr), blockDevResolved) -+ s.Info("triggering partition %d %s on %q", partNr, op, devAlias) -+ s.Debug("executing: %q", cmd.Args) -+ _, err := cmd.Output() -+ if err, ok := err.(*exec.ExitError); ok { -+ s.Notice("%v: Cmd: %q Stderr: %q", err, cmd.Args, err.Stderr) - } -- return nil -- } -- if err := runPartxCommand("delete", partxDelete); err != nil { -- return err -- } -- if err := runPartxCommand("update", partxUpdate); err != nil { -- return err -- } -- if err := runPartxCommand("add", partxAdd); err != nil { -- return err - } - } -+ runPartxCommand("delete", slices.Values(partxDelete)) -+ runPartxCommand("update", slices.Values(partxUpdate)) -+ runPartxCommand("add", slices.Values(partxAdd)) - - // It's best to wait here for the /dev/ABC entries to be - // (re)created, not only for other parts of the initramfs but -@@ -633,5 +657,70 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error { - return fmt.Errorf("failed to wait for udev on %q after partitioning: %v", devAlias, err) - } - -+ for _, part := range resolvedPartitions { -+ partDev := partitionDevPath(blockDevResolved, dmName, prefix, part.Number) -+ -+ if slices.Contains(partxDelete, part.Number) { -+ _, err := os.Stat(partDev) -+ if err == nil { -+ return fmt.Errorf("%q unexpectedly exists after partitioning", partDev) -+ } else if !os.IsNotExist(err) { -+ return fmt.Errorf("failed to stat %q after partitioning: %v", partDev, err) -+ } -+ } else if slices.Contains(partxAdd, part.Number) || slices.Contains(partxUpdate, part.Number) { -+ var kernelStart, kernelSize int64 -+ -+ // sysfs always reports in 512-byte sectors; convert our expected -+ // values from logical sectors to 512-byte sectors for comparison -+ logicalTo512 := int64(diskInfo.LogicalSectorSize) / 512 -+ -+ if dmName != "" { -+ // DM partition devices don't have a "start" entry in -+ // sysfs. Use dmsetup table to get start and size. -+ kernelStart, kernelSize, err = dmPartitionStartAndSize(partDev) -+ if err != nil { -+ return fmt.Errorf("failed to get DM table for %q: %v", partDev, err) -+ } -+ } else { -+ partDevResolved, err := filepath.EvalSymlinks(partDev) -+ if err != nil { -+ return fmt.Errorf("failed to resolve %q: %v", partDev, err) -+ } -+ sysBlockDir := fmt.Sprintf("/sys/class/block/%s/", filepath.Base(partDevResolved)) -+ -+ startStr, err := os.ReadFile(sysBlockDir + "start") -+ if err != nil { -+ return fmt.Errorf("failed to read start of %q from sysfs: %v", partDev, err) -+ } -+ kernelStart, err = strconv.ParseInt(strings.TrimSpace(string(startStr)), 10, 64) -+ if err != nil { -+ return fmt.Errorf("failed to parse start of %q from sysfs: %v", partDev, err) -+ } -+ -+ sizeStr, err := os.ReadFile(sysBlockDir + "size") -+ if err != nil { -+ return fmt.Errorf("failed to read size of %q from sysfs: %v", partDev, err) -+ } -+ kernelSize, err = strconv.ParseInt(strings.TrimSpace(string(sizeStr)), 10, 64) -+ if err != nil { -+ return fmt.Errorf("failed to parse size of %q from sysfs: %v", partDev, err) -+ } -+ } -+ -+ if part.StartSector != nil { -+ expectedStart := *part.StartSector * logicalTo512 -+ if kernelStart != expectedStart { -+ return fmt.Errorf("kernel partition start for %q does not match expected (%d != %d 512-byte sectors)", partDev, kernelStart, expectedStart) -+ } -+ } -+ if part.SizeInSectors != nil { -+ expectedSize := *part.SizeInSectors * logicalTo512 -+ if kernelSize != expectedSize { -+ return fmt.Errorf("kernel partition size for %q does not match expected (%d != %d 512-byte sectors)", partDev, kernelSize, expectedSize) -+ } -+ } -+ } -+ } -+ - return nil - } --- -2.54.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.26.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.27.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.26.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.27.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 22af9903112..47b3b92460f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild @@ -16,25 +16,21 @@ else KEYWORDS="amd64 arm64" PATCHES=( - "${FILESDIR}/0001-sed-s-coreos-flatcar.patch" - "${FILESDIR}/0002-config-add-ignition-translation.patch" - "${FILESDIR}/0003-mod-add-flatcar-ignition-0.36.2.patch" - "${FILESDIR}/0004-config-v3_7-convert-ignition-2.x-to-3.x.patch" - "${FILESDIR}/0005-vendor-go-mod-vendor.patch" - "${FILESDIR}/0006-internal-prv-cmdline-backport-flatcar-patch.patch" - "${FILESDIR}/0007-provider-qemu-apply-fw_cfg-patch.patch" - "${FILESDIR}/0008-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch" - "${FILESDIR}/0009-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch" - "${FILESDIR}/0010-config-version-handle-configuration-version-1.patch" - "${FILESDIR}/0011-config-util-add-cloud-init-detection-to-initial-pars.patch" - "${FILESDIR}/0012-Partially-revert-drop-OEM-URI-support.patch" - "${FILESDIR}/0013-config-Support-oem-schema-in-newer-config-spec-versi.patch" - "${FILESDIR}/0014-translation-support-OEM-and-oem.patch" - "${FILESDIR}/0015-usr-share-oem-oem.patch" - "${FILESDIR}/0016-internal-exec-stages-mount-Mount-oem.patch" - "${FILESDIR}/0017-stages-disks-Fix-handling-of-device-mapper-when-part.patch" - "${FILESDIR}/0018-stages-disks-Fix-giving-partition-number-0-to-get-th.patch" - "${FILESDIR}/0019-stages-disks-Allow-partx-to-fail-then-check-the-stat.patch" + "${FILESDIR}"/0001-config-add-ignition-translation.patch + "${FILESDIR}"/0002-mod-add-flatcar-ignition-0.36.2.patch + "${FILESDIR}"/0003-config-v3_7-convert-ignition-2.x-to-3.x.patch + "${FILESDIR}"/0004-internal-prv-cmdline-backport-flatcar-patch.patch + "${FILESDIR}"/0005-provider-qemu-apply-fw_cfg-patch.patch + "${FILESDIR}"/0006-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch + "${FILESDIR}"/0007-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch + "${FILESDIR}"/0008-config-version-handle-configuration-version-1.patch + "${FILESDIR}"/0009-config-util-add-cloud-init-detection-to-initial-pars.patch + "${FILESDIR}"/0010-translation-support-OEM-and-oem.patch + "${FILESDIR}"/0011-internal-exec-stages-mount-Mount-oem.patch + "${FILESDIR}"/0012-go-mod-vendor.patch + "${FILESDIR}"/0013-Partially-revert-drop-OEM-URI-support.patch + "${FILESDIR}"/0014-config-Support-oem-schema-in-newer-config-spec-versi.patch + "${FILESDIR}"/0015-usr-share-oem-oem.patch ) fi @@ -57,6 +53,11 @@ RDEPEND=" sys-fs/xfsprogs " +src_prepare() { + default + find -type f -print0 | xargs -0 sed -i "s:\bgithub\.com/coreos/ignition\b:github.com/flatcar/ignition:g" || die +} + src_compile() { ego build \ -ldflags "-X github.com/flatcar/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar/ignition/v2/internal/distro.selinuxRelabel=false" \ From 8bb0435805cc47bde5fb2c40ef303b6f2bd6f027 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 4 Sep 2026 13:01:33 +0100 Subject: [PATCH 2/2] coreos-base/coreos-init: Bump for oem-cloudinit.service escape fix Signed-off-by: James Le Cuirot --- .../third_party/coreos-overlay/coreos-base/coreos-init/Manifest | 2 +- ...eos-init-0.0.1-r207.ebuild => coreos-init-0.0.1-r208.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r207.ebuild => coreos-init-0.0.1-r208.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest index e7e498f1c37..27dd84b81b9 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/Manifest @@ -1 +1 @@ -DIST coreos-init-3f8581468918512566a35974fe18479c7a353098.tar.gz 60356 BLAKE2B 8cab828dae68cf59a4cfd4aa12c190f2f33d0fe57089c3989317fee11f7cd7b79ca925d2095e508ec5327dd73d81e198e401cee58fd36b96989668c7eb4298fc SHA512 1b6311e5607dcac8b512cc0843b7b91764c256ff5b94bc06c5be4bbdf013c5e0d14570e50c51ad756db71d8ac2fa3068291b3fa942bd3b97051d142a940a7de3 +DIST coreos-init-77ffa2ca15cc4a78fda1268ed830bd15604b6533.tar.gz 60347 BLAKE2B acf7a0a28026fcf2d215bca9749f3fc2b78020fbae1b99ee8506191a10cfc49564684fe73ac11c8cac88486789d4263fce82c4d9e4686df800593b7654e44105 SHA512 49ec6c0c4353611f310c34fa7dd304cac55eece8ff74255da19b6cd45d70124f8f3a8a9a7928707220a0a4c7610b827bd9669ef2105008a80b88d9e14cb0ab59 diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r207.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r208.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r207.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r208.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 170723aa013..5f44bbd7095 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/flatcar/init.git" inherit git-r3 else - EGIT_VERSION="3f8581468918512566a35974fe18479c7a353098" # flatcar-master + EGIT_VERSION="77ffa2ca15cc4a78fda1268ed830bd15604b6533" # flatcar-master SRC_URI="https://github.com/flatcar/init/archive/${EGIT_VERSION}.tar.gz -> ${PN}-${EGIT_VERSION}.tar.gz" S="${WORKDIR}/init-${EGIT_VERSION}" KEYWORDS="amd64 arm arm64 x86"