From a1f9981279db15370f70417c23302cb2cbc1e0ee Mon Sep 17 00:00:00 2001 From: Jan Larwig Date: Mon, 4 Nov 2024 10:58:51 +0100 Subject: [PATCH] temp: ignition patch --- .../files/0001-sed-s-coreos-flatcar.patch | 1400 +++++------------ ...0002-config-add-ignition-translation.patch | 22 +- ...0003-mod-add-flatcar-ignition-0.36.2.patch | 22 +- .../ignition/files/0004-sum-go-mod-tidy.patch | 8 +- .../files/0005-vendor-go-mod-vendor.patch | 21 +- ...fig-v3_5-convert-ignition-2.x-to-3.x.patch | 76 + ...l-prv-cmdline-backport-flatcar-patch.patch | 6 +- ...008-provider-qemu-apply-fw_cfg-patch.patch | 18 +- ...3_5-test-add-ignition-2.x-test-cases.patch | 44 + ...-ignore-fs-format-mismatches-for-the.patch | 6 +- ...info.-.config.data-and-.config.url-v.patch | 6 +- ...rsion-handle-configuration-version-1.patch | 6 +- ...cloud-init-detection-to-initial-pars.patch | 6 +- .../0014-Revert-drop-OEM-URI-support.patch | 8 +- ...e-url-support-btrfs-as-OEM-partition.patch | 6 +- ...0016-translation-support-OEM-and-oem.patch | 6 +- ...7-revert-internal-oem-drop-noop-OEMs.patch | 6 +- ...dded-platforms-to-docs-to-pass-tests.patch | 10 +- .../files/0019-usr-share-oem-oem.patch | 6 +- ...internal-exec-stages-mount-Mount-oem.patch | 6 +- .../0021-akamai-fix-base64-decoding.patch | 31 + .../0022-another-sed-s-coreos-flatcar.patch | 819 ++++++++++ .../sys-apps/ignition/ignition-9999.ebuild | 6 +- 23 files changed, 1465 insertions(+), 1080 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-akamai-fix-base64-decoding.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-another-sed-s-coreos-flatcar.patch 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 index 8cb7e894ab1..b62d8aae204 100644 --- 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 @@ -1,18 +1,18 @@ -From eae9a401894ccbb9be1f94c1d23726fa0cb1c480 Mon Sep 17 00:00:00 2001 +From 2293c11daef23b3acdbb0eefcab2beaf8a18f029 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Thu, 24 Oct 2024 10:01:18 +0200 -Subject: [PATCH 01/20] *: sed `s/coreos/flatcar/` +Date: Fri, 7 Jun 2024 09:08:51 +0200 +Subject: [PATCH 01/22] *: sed `s/coreos/flatcar/` Signed-off-by: Mathieu Tortuyaux --- - build | 4 +- + build | 2 +- build_blackbox_tests | 10 ++-- build_for_container | 2 +- config/config.go | 4 +- config/config_test.go | 16 +++--- config/doc/generate.go | 2 +- config/doc/schema.go | 2 +- - config/merge/merge.go | 6 +-- + config/merge/merge.go | 6 +- config/merge/merge_test.go | 8 +-- config/shared/validations/unit.go | 2 +- config/translate/translate.go | 2 +- @@ -41,7 +41,7 @@ Signed-off-by: Mathieu Tortuyaux 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.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 +- @@ -78,7 +78,7 @@ Signed-off-by: Mathieu Tortuyaux 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.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 +- @@ -88,7 +88,7 @@ Signed-off-by: Mathieu Tortuyaux 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.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 +- @@ -117,7 +117,7 @@ Signed-off-by: Mathieu Tortuyaux 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.go | 6 +- config/v3_2/types/systemd_test.go | 4 +- config/v3_2/types/tang.go | 4 +- config/v3_2/types/unit.go | 8 +-- @@ -159,7 +159,7 @@ Signed-off-by: Mathieu Tortuyaux 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.go | 6 +- config/v3_3/types/systemd_test.go | 4 +- config/v3_3/types/tang.go | 4 +- config/v3_3/types/unit.go | 8 +-- @@ -201,7 +201,7 @@ Signed-off-by: Mathieu Tortuyaux 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.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 +- @@ -211,15 +211,13 @@ Signed-off-by: Mathieu Tortuyaux 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.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 +- @@ -246,7 +244,7 @@ Signed-off-by: Mathieu Tortuyaux 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.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 +- @@ -257,76 +255,40 @@ Signed-off-by: Mathieu Tortuyaux config/v3_5/types/verification.go | 2 +- config/v3_5/types/verification_test.go | 2 +- config/v3_6_experimental/config.go | 14 ++--- - config/v3_6_experimental/config_test.go | 4 +- - .../v3_6_experimental/translate/translate.go | 6 +-- - .../translate/translate_test.go | 4 +- - config/v3_6_experimental/types/cex.go | 2 +- - config/v3_6_experimental/types/cex_test.go | 2 +- - config/v3_6_experimental/types/clevis.go | 4 +- - config/v3_6_experimental/types/clevis_test.go | 4 +- config/v3_6_experimental/types/config.go | 4 +- - config/v3_6_experimental/types/config_test.go | 4 +- - config/v3_6_experimental/types/disk.go | 4 +- - config/v3_6_experimental/types/file.go | 4 +- - config/v3_6_experimental/types/file_test.go | 4 +- - config/v3_6_experimental/types/filesystem.go | 4 +- - .../types/filesystem_test.go | 4 +- - config/v3_6_experimental/types/headers.go | 2 +- - .../v3_6_experimental/types/headers_test.go | 2 +- - config/v3_6_experimental/types/ignition.go | 2 +- - config/v3_6_experimental/types/kargs_test.go | 2 +- - config/v3_6_experimental/types/luks.go | 4 +- - config/v3_6_experimental/types/mode.go | 2 +- - config/v3_6_experimental/types/mode_test.go | 4 +- - config/v3_6_experimental/types/node.go | 4 +- - config/v3_6_experimental/types/node_test.go | 4 +- - config/v3_6_experimental/types/partition.go | 4 +- - .../v3_6_experimental/types/partition_test.go | 4 +- - config/v3_6_experimental/types/path.go | 4 +- - config/v3_6_experimental/types/path_test.go | 2 +- - config/v3_6_experimental/types/proxy.go | 2 +- - config/v3_6_experimental/types/proxy_test.go | 4 +- - config/v3_6_experimental/types/raid.go | 4 +- - config/v3_6_experimental/types/raid_test.go | 4 +- - config/v3_6_experimental/types/resource.go | 4 +- - config/v3_6_experimental/types/storage.go | 4 +- - .../v3_6_experimental/types/storage_test.go | 4 +- - config/v3_6_experimental/types/systemd.go | 6 +-- - .../v3_6_experimental/types/systemd_test.go | 4 +- - config/v3_6_experimental/types/tang.go | 4 +- - config/v3_6_experimental/types/tang_test.go | 4 +- - config/v3_6_experimental/types/unit.go | 8 +-- - config/v3_6_experimental/types/unit_test.go | 4 +- - config/v3_6_experimental/types/url.go | 4 +- - config/v3_6_experimental/types/url_test.go | 4 +- - .../v3_6_experimental/types/verification.go | 2 +- - .../types/verification_test.go | 2 +- config/validate/validate.go | 4 +- config/validate/validate_test.go | 2 +- + docs/_config.yml | 4 +- + docs/development.md | 12 ++-- + docs/distributor-notes.md | 6 +- + docs/getting-started.md | 6 +- + docs/index.md | 6 +- + docs/migrating-configs.md | 2 +- + docs/specs.md | 2 +- dracut/30ignition/ignition-complete.target | 2 +- .../ignition-diskful-subsequent.target | 2 +- dracut/30ignition/ignition-diskful.target | 2 +- dracut/30ignition/ignition-subsequent.target | 2 +- dracut/30ignition/module-setup.sh | 2 +- go.mod | 2 +- - internal/apply/apply.go | 30 +++++------ + internal/apply/apply.go | 30 +++++----- internal/distro/distro.go | 2 +- internal/doc/main.go | 16 +++--- - internal/exec/config_fetcher.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 ++--- + 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 ++--- + .../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.go | 12 ++-- internal/exec/stages/files/units_test.go | 4 +- internal/exec/stages/kargs/kargs.go | 14 ++--- internal/exec/stages/mount/mount.go | 16 +++--- @@ -338,54 +300,53 @@ Signed-off-by: Mathieu Tortuyaux 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/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/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 ++--- + 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/hyperv/kvp.go | 12 ++-- internal/providers/ibmcloud/ibmcloud.go | 14 ++--- + internal/providers/ionoscloud/ionoscloud.go | 14 ++--- internal/providers/kubevirt/kubevirt.go | 14 ++--- internal/providers/metal/metal.go | 8 +-- internal/providers/nutanix/nutanix.go | 14 ++--- internal/providers/openstack/openstack.go | 16 +++--- 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_blockdev.go | 12 ++-- internal/providers/qemu/qemu_fwcfg.go | 10 ++-- internal/providers/scaleway/scaleway.go | 8 +-- internal/providers/system/system.go | 14 ++--- - internal/providers/util/config.go | 6 +-- + 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 +-- + .../providers/vmware/vmware_unsupported.go | 6 +- internal/providers/vultr/vultr.go | 8 +-- internal/providers/zvm/zvm.go | 14 ++--- - internal/register/providers.go | 54 +++++++++---------- + internal/register/providers.go | 56 +++++++++---------- internal/register/stages.go | 14 ++--- - internal/resource/http.go | 12 ++--- - internal/resource/url.go | 6 +-- - internal/resource/url_test.go | 6 +-- + internal/resource/http.go | 12 ++-- + internal/resource/url.go | 6 +- + 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/blackbox_test.go | 12 ++-- tests/filesystem.go | 4 +- tests/negative/files/invalid_hash.go | 4 +- tests/negative/files/link.go | 4 +- @@ -396,27 +357,25 @@ Signed-off-by: Mathieu Tortuyaux 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/security/tls.go | 6 +- tests/negative/timeouts/timeouts.go | 4 +- tests/positive/files/directory.go | 4 +- tests/positive/files/file.go | 4 +- - tests/positive/files/hash.go | 6 +-- - tests/positive/files/link.go | 6 +-- - tests/positive/files/remote.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 +-- + .../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/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 +- @@ -433,25 +392,16 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/systemd/modify_service.go | 4 +- tests/positive/timeouts/timeouts.go | 4 +- tests/register/register.go | 16 +++--- - tests/registry/registry.go | 40 +++++++------- + tests/registry/registry.go | 40 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 432 files changed, 1141 insertions(+), 1141 deletions(-) + 391 files changed, 1067 insertions(+), 1067 deletions(-) diff --git a/build b/build -index 9bf93d61..5abdcf5f 100755 +index 9bf93d61..4a50527c 100755 --- a/build +++ b/build -@@ -5,7 +5,7 @@ set -eu - export GO111MODULE=on - - NAME="ignition" --ORG_PATH="github.com/coreos" -+ORG_PATH="github.com/flatcar" - REPO_PATH="${ORG_PATH}/${NAME}/v2" - GLDFLAGS=${GLDFLAGS:-} - export GOFLAGS=-mod=vendor @@ -15,7 +15,7 @@ if [ -z ${VERSION+a} ]; then echo "Using version from git: $VERSION" fi @@ -3571,31 +3521,6 @@ index 9a0914d0..f121b503 100644 "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 @@ -3699,21 +3624,6 @@ index f616868c..c28509ee 100644 "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 @@ -3732,678 +3642,7 @@ index 3d82627b..511c5ecd 100644 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 9b71bb26..e3f7fbdf 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 9eb7573d..67c7ebd3 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 8966e25d..5c973dbf 100644 ---- a/config/v3_5/types/mode_test.go -+++ b/config/v3_5/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_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 3ca189da..9b2b4405 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/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_experimental/config.go b/config/v3_6_experimental/config.go -index e67b08ba..3be26cae 100644 ---- a/config/v3_6_experimental/config.go -+++ b/config/v3_6_experimental/config.go -@@ -15,13 +15,13 @@ - package v3_6_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_5" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/translate" -- "github.com/coreos/ignition/v2/config/v3_6_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_5" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/translate" -+ "github.com/flatcar/ignition/v2/config/v3_6_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_6_experimental/config_test.go b/config/v3_6_experimental/config_test.go -index 8ba56163..54cbd91c 100644 ---- a/config/v3_6_experimental/config_test.go -+++ b/config/v3_6_experimental/config_test.go -@@ -17,8 +17,8 @@ package v3_6_experimental - import ( - "testing" - -- "github.com/coreos/ignition/v2/config/shared/errors" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" -+ "github.com/flatcar/ignition/v2/config/shared/errors" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" - "github.com/stretchr/testify/assert" - ) - -diff --git a/config/v3_6_experimental/translate/translate.go b/config/v3_6_experimental/translate/translate.go -index bf3f11e9..a0755bb4 100644 ---- a/config/v3_6_experimental/translate/translate.go -+++ b/config/v3_6_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_5/types" -- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" -+ "github.com/flatcar/ignition/v2/config/translate" -+ old_types "github.com/flatcar/ignition/v2/config/v3_5/types" -+ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" - ) - - func translateIgnition(old old_types.Ignition) (ret types.Ignition) { -diff --git a/config/v3_6_experimental/translate/translate_test.go b/config/v3_6_experimental/translate/translate_test.go -index fc9e3de5..cc041bdc 100644 ---- a/config/v3_6_experimental/translate/translate_test.go -+++ b/config/v3_6_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_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_experimental/types/cex.go b/config/v3_6_experimental/types/cex.go -index b34f5f52..6f58b373 100644 ---- a/config/v3_6_experimental/types/cex.go -+++ b/config/v3_6_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_6_experimental/types/cex_test.go b/config/v3_6_experimental/types/cex_test.go -index 35d562d8..e856a93f 100644 ---- a/config/v3_6_experimental/types/cex_test.go -+++ b/config/v3_6_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_6_experimental/types/clevis.go b/config/v3_6_experimental/types/clevis.go -index 68887d43..564154f6 100644 ---- a/config/v3_6_experimental/types/clevis.go -+++ b/config/v3_6_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_6_experimental/types/clevis_test.go b/config/v3_6_experimental/types/clevis_test.go -index f616868c..c28509ee 100644 ---- a/config/v3_6_experimental/types/clevis_test.go -+++ b/config/v3_6_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_6_experimental/types/config.go b/config/v3_6_experimental/types/config.go -index 9428b0bb..4d042f54 100644 ---- a/config/v3_6_experimental/types/config.go -+++ b/config/v3_6_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_6_experimental/types/config_test.go b/config/v3_6_experimental/types/config_test.go -index 3d82627b..511c5ecd 100644 ---- a/config/v3_6_experimental/types/config_test.go -+++ b/config/v3_6_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_6_experimental/types/disk.go b/config/v3_6_experimental/types/disk.go -index 8caf8499..29fd3900 100644 ---- a/config/v3_6_experimental/types/disk.go -+++ b/config/v3_6_experimental/types/disk.go ++++ b/config/v3_5/types/disk.go @@ -15,8 +15,8 @@ package types @@ -4415,10 +3654,10 @@ index 8caf8499..29fd3900 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/file.go b/config/v3_6_experimental/types/file.go +diff --git a/config/v3_5/types/file.go b/config/v3_5/types/file.go index 9b71bb26..e3f7fbdf 100644 ---- a/config/v3_6_experimental/types/file.go -+++ b/config/v3_6_experimental/types/file.go +--- a/config/v3_5/types/file.go ++++ b/config/v3_5/types/file.go @@ -15,8 +15,8 @@ package types @@ -4430,10 +3669,10 @@ index 9b71bb26..e3f7fbdf 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/file_test.go b/config/v3_6_experimental/types/file_test.go +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_6_experimental/types/file_test.go -+++ b/config/v3_6_experimental/types/file_test.go +--- a/config/v3_5/types/file_test.go ++++ b/config/v3_5/types/file_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4445,10 +3684,10 @@ index 449e0700..5aa2e87c 100644 ) func TestFileValidateOverwrite(t *testing.T) { -diff --git a/config/v3_6_experimental/types/filesystem.go b/config/v3_6_experimental/types/filesystem.go +diff --git a/config/v3_5/types/filesystem.go b/config/v3_5/types/filesystem.go index c722b363..9f7f8bbc 100644 ---- a/config/v3_6_experimental/types/filesystem.go -+++ b/config/v3_6_experimental/types/filesystem.go +--- a/config/v3_5/types/filesystem.go ++++ b/config/v3_5/types/filesystem.go @@ -15,8 +15,8 @@ package types @@ -4460,10 +3699,10 @@ index c722b363..9f7f8bbc 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/filesystem_test.go b/config/v3_6_experimental/types/filesystem_test.go +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_6_experimental/types/filesystem_test.go -+++ b/config/v3_6_experimental/types/filesystem_test.go +--- a/config/v3_5/types/filesystem_test.go ++++ b/config/v3_5/types/filesystem_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4475,10 +3714,10 @@ index 1f8db903..6e710426 100644 ) func TestFilesystemValidateFormat(t *testing.T) { -diff --git a/config/v3_6_experimental/types/headers.go b/config/v3_6_experimental/types/headers.go +diff --git a/config/v3_5/types/headers.go b/config/v3_5/types/headers.go index be1aadad..e968a2b4 100644 ---- a/config/v3_6_experimental/types/headers.go -+++ b/config/v3_6_experimental/types/headers.go +--- a/config/v3_5/types/headers.go ++++ b/config/v3_5/types/headers.go @@ -17,7 +17,7 @@ package types import ( "net/http" @@ -4488,10 +3727,10 @@ index be1aadad..e968a2b4 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) -diff --git a/config/v3_6_experimental/types/headers_test.go b/config/v3_6_experimental/types/headers_test.go +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_6_experimental/types/headers_test.go -+++ b/config/v3_6_experimental/types/headers_test.go +--- a/config/v3_5/types/headers_test.go ++++ b/config/v3_5/types/headers_test.go @@ -17,7 +17,7 @@ package types import ( "testing" @@ -4501,10 +3740,10 @@ index 40380b68..5e888830 100644 ) func toPointer(val string) *string { -diff --git a/config/v3_6_experimental/types/ignition.go b/config/v3_6_experimental/types/ignition.go +diff --git a/config/v3_5/types/ignition.go b/config/v3_5/types/ignition.go index 190445bd..1fbcf8c4 100644 ---- a/config/v3_6_experimental/types/ignition.go -+++ b/config/v3_6_experimental/types/ignition.go +--- 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" @@ -4514,10 +3753,10 @@ index 190445bd..1fbcf8c4 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/kargs_test.go b/config/v3_6_experimental/types/kargs_test.go +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_6_experimental/types/kargs_test.go -+++ b/config/v3_6_experimental/types/kargs_test.go +--- a/config/v3_5/types/kargs_test.go ++++ b/config/v3_5/types/kargs_test.go @@ -17,7 +17,7 @@ package types import ( "testing" @@ -4527,10 +3766,10 @@ index 1a258727..a79c037a 100644 ) func TestKernelArgumentsValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/luks.go b/config/v3_6_experimental/types/luks.go +diff --git a/config/v3_5/types/luks.go b/config/v3_5/types/luks.go index e4c1d681..ce9d087f 100644 ---- a/config/v3_6_experimental/types/luks.go -+++ b/config/v3_6_experimental/types/luks.go +--- a/config/v3_5/types/luks.go ++++ b/config/v3_5/types/luks.go @@ -17,8 +17,8 @@ package types import ( "strings" @@ -4542,10 +3781,10 @@ index e4c1d681..ce9d087f 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/mode.go b/config/v3_6_experimental/types/mode.go +diff --git a/config/v3_5/types/mode.go b/config/v3_5/types/mode.go index 9eb7573d..67c7ebd3 100644 ---- a/config/v3_6_experimental/types/mode.go -+++ b/config/v3_6_experimental/types/mode.go +--- a/config/v3_5/types/mode.go ++++ b/config/v3_5/types/mode.go @@ -15,7 +15,7 @@ package types @@ -4555,10 +3794,10 @@ index 9eb7573d..67c7ebd3 100644 ) func validateMode(m *int) error { -diff --git a/config/v3_6_experimental/types/mode_test.go b/config/v3_6_experimental/types/mode_test.go +diff --git a/config/v3_5/types/mode_test.go b/config/v3_5/types/mode_test.go index 8966e25d..5c973dbf 100644 ---- a/config/v3_6_experimental/types/mode_test.go -+++ b/config/v3_6_experimental/types/mode_test.go +--- a/config/v3_5/types/mode_test.go ++++ b/config/v3_5/types/mode_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4570,10 +3809,10 @@ index 8966e25d..5c973dbf 100644 ) func TestModeValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/node.go b/config/v3_6_experimental/types/node.go +diff --git a/config/v3_5/types/node.go b/config/v3_5/types/node.go index 248276e7..f4e94f9e 100644 ---- a/config/v3_6_experimental/types/node.go -+++ b/config/v3_6_experimental/types/node.go +--- a/config/v3_5/types/node.go ++++ b/config/v3_5/types/node.go @@ -17,8 +17,8 @@ package types import ( "path" @@ -4585,10 +3824,10 @@ index 248276e7..f4e94f9e 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/node_test.go b/config/v3_6_experimental/types/node_test.go +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_6_experimental/types/node_test.go -+++ b/config/v3_6_experimental/types/node_test.go +--- a/config/v3_5/types/node_test.go ++++ b/config/v3_5/types/node_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4600,10 +3839,10 @@ index 20ba4eb6..9176b4b7 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/partition.go b/config/v3_6_experimental/types/partition.go +diff --git a/config/v3_5/types/partition.go b/config/v3_5/types/partition.go index 1b2d97ed..6603af3b 100644 ---- a/config/v3_6_experimental/types/partition.go -+++ b/config/v3_6_experimental/types/partition.go +--- a/config/v3_5/types/partition.go ++++ b/config/v3_5/types/partition.go @@ -19,8 +19,8 @@ import ( "regexp" "strings" @@ -4615,10 +3854,10 @@ index 1b2d97ed..6603af3b 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/partition_test.go b/config/v3_6_experimental/types/partition_test.go +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_6_experimental/types/partition_test.go -+++ b/config/v3_6_experimental/types/partition_test.go +--- a/config/v3_5/types/partition_test.go ++++ b/config/v3_5/types/partition_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4630,10 +3869,10 @@ index a1e1623f..9f8e7997 100644 ) func TestValidateLabel(t *testing.T) { -diff --git a/config/v3_6_experimental/types/path.go b/config/v3_6_experimental/types/path.go +diff --git a/config/v3_5/types/path.go b/config/v3_5/types/path.go index 131e300c..cb48e341 100644 ---- a/config/v3_6_experimental/types/path.go -+++ b/config/v3_6_experimental/types/path.go +--- a/config/v3_5/types/path.go ++++ b/config/v3_5/types/path.go @@ -17,8 +17,8 @@ package types import ( "path" @@ -4645,10 +3884,10 @@ index 131e300c..cb48e341 100644 ) func validatePath(p string) error { -diff --git a/config/v3_6_experimental/types/path_test.go b/config/v3_6_experimental/types/path_test.go +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_6_experimental/types/path_test.go -+++ b/config/v3_6_experimental/types/path_test.go +--- a/config/v3_5/types/path_test.go ++++ b/config/v3_5/types/path_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" @@ -4658,10 +3897,10 @@ index 3d199cbd..33b2d0ba 100644 ) func TestPathValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/proxy.go b/config/v3_6_experimental/types/proxy.go +diff --git a/config/v3_5/types/proxy.go b/config/v3_5/types/proxy.go index d48d210a..de146a99 100644 ---- a/config/v3_6_experimental/types/proxy.go -+++ b/config/v3_6_experimental/types/proxy.go +--- a/config/v3_5/types/proxy.go ++++ b/config/v3_5/types/proxy.go @@ -17,7 +17,7 @@ package types import ( "net/url" @@ -4671,10 +3910,10 @@ index d48d210a..de146a99 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/proxy_test.go b/config/v3_6_experimental/types/proxy_test.go +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_6_experimental/types/proxy_test.go -+++ b/config/v3_6_experimental/types/proxy_test.go +--- a/config/v3_5/types/proxy_test.go ++++ b/config/v3_5/types/proxy_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4686,10 +3925,10 @@ index 269f4fb2..3cc5e5cd 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/raid.go b/config/v3_6_experimental/types/raid.go +diff --git a/config/v3_5/types/raid.go b/config/v3_5/types/raid.go index 9d69aa36..fa1d3f4d 100644 ---- a/config/v3_6_experimental/types/raid.go -+++ b/config/v3_6_experimental/types/raid.go +--- a/config/v3_5/types/raid.go ++++ b/config/v3_5/types/raid.go @@ -15,8 +15,8 @@ package types @@ -4701,10 +3940,10 @@ index 9d69aa36..fa1d3f4d 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/raid_test.go b/config/v3_6_experimental/types/raid_test.go +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_6_experimental/types/raid_test.go -+++ b/config/v3_6_experimental/types/raid_test.go +--- a/config/v3_5/types/raid_test.go ++++ b/config/v3_5/types/raid_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4716,10 +3955,10 @@ index 7323b26f..313b4572 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/resource.go b/config/v3_6_experimental/types/resource.go +diff --git a/config/v3_5/types/resource.go b/config/v3_5/types/resource.go index 68da6c7b..6ea74d3d 100644 ---- a/config/v3_6_experimental/types/resource.go -+++ b/config/v3_6_experimental/types/resource.go +--- a/config/v3_5/types/resource.go ++++ b/config/v3_5/types/resource.go @@ -17,8 +17,8 @@ package types import ( "net/url" @@ -4731,10 +3970,10 @@ index 68da6c7b..6ea74d3d 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/storage.go b/config/v3_6_experimental/types/storage.go +diff --git a/config/v3_5/types/storage.go b/config/v3_5/types/storage.go index 20cb7304..552749e6 100644 ---- a/config/v3_6_experimental/types/storage.go -+++ b/config/v3_6_experimental/types/storage.go +--- a/config/v3_5/types/storage.go ++++ b/config/v3_5/types/storage.go @@ -18,8 +18,8 @@ import ( "path" "strings" @@ -4746,10 +3985,10 @@ index 20cb7304..552749e6 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/storage_test.go b/config/v3_6_experimental/types/storage_test.go +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_6_experimental/types/storage_test.go -+++ b/config/v3_6_experimental/types/storage_test.go +--- a/config/v3_5/types/storage_test.go ++++ b/config/v3_5/types/storage_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4761,10 +4000,10 @@ index 551688a2..6c35ed27 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/systemd.go b/config/v3_6_experimental/types/systemd.go +diff --git a/config/v3_5/types/systemd.go b/config/v3_5/types/systemd.go index ac521ba7..818959f4 100644 ---- a/config/v3_6_experimental/types/systemd.go -+++ b/config/v3_6_experimental/types/systemd.go +--- a/config/v3_5/types/systemd.go ++++ b/config/v3_5/types/systemd.go @@ -17,9 +17,9 @@ package types import ( "regexp" @@ -4778,10 +4017,10 @@ index ac521ba7..818959f4 100644 vpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/systemd_test.go b/config/v3_6_experimental/types/systemd_test.go +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_6_experimental/types/systemd_test.go -+++ b/config/v3_6_experimental/types/systemd_test.go +--- a/config/v3_5/types/systemd_test.go ++++ b/config/v3_5/types/systemd_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" @@ -4793,10 +4032,10 @@ index 798eb10f..b432e83b 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" "github.com/stretchr/testify/assert" -diff --git a/config/v3_6_experimental/types/tang.go b/config/v3_6_experimental/types/tang.go +diff --git a/config/v3_5/types/tang.go b/config/v3_5/types/tang.go index 1839d6cc..26c155e5 100644 ---- a/config/v3_6_experimental/types/tang.go -+++ b/config/v3_6_experimental/types/tang.go +--- a/config/v3_5/types/tang.go ++++ b/config/v3_5/types/tang.go @@ -18,8 +18,8 @@ import ( "encoding/json" "net/url" @@ -4808,10 +4047,10 @@ index 1839d6cc..26c155e5 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/tang_test.go b/config/v3_6_experimental/types/tang_test.go +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_6_experimental/types/tang_test.go -+++ b/config/v3_6_experimental/types/tang_test.go +--- a/config/v3_5/types/tang_test.go ++++ b/config/v3_5/types/tang_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" @@ -4823,10 +4062,10 @@ index fb57b1e4..ed65a712 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) -diff --git a/config/v3_6_experimental/types/unit.go b/config/v3_6_experimental/types/unit.go +diff --git a/config/v3_5/types/unit.go b/config/v3_5/types/unit.go index c5ee1e8e..5a9c3b22 100644 ---- a/config/v3_6_experimental/types/unit.go -+++ b/config/v3_6_experimental/types/unit.go +--- a/config/v3_5/types/unit.go ++++ b/config/v3_5/types/unit.go @@ -17,10 +17,10 @@ package types import ( "path" @@ -4842,10 +4081,10 @@ index c5ee1e8e..5a9c3b22 100644 cpath "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/unit_test.go b/config/v3_6_experimental/types/unit_test.go +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_6_experimental/types/unit_test.go -+++ b/config/v3_6_experimental/types/unit_test.go +--- a/config/v3_5/types/unit_test.go ++++ b/config/v3_5/types/unit_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" @@ -4857,10 +4096,10 @@ index 3dc90540..8c96dfba 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/url.go b/config/v3_6_experimental/types/url.go +diff --git a/config/v3_5/types/url.go b/config/v3_5/types/url.go index 3ca189da..9b2b4405 100644 ---- a/config/v3_6_experimental/types/url.go -+++ b/config/v3_6_experimental/types/url.go +--- 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/aws/arn" "github.com/vincent-petithory/dataurl" @@ -4872,10 +4111,10 @@ index 3ca189da..9b2b4405 100644 ) func validateURL(s string) error { -diff --git a/config/v3_6_experimental/types/url_test.go b/config/v3_6_experimental/types/url_test.go +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_6_experimental/types/url_test.go -+++ b/config/v3_6_experimental/types/url_test.go +--- a/config/v3_5/types/url_test.go ++++ b/config/v3_5/types/url_test.go @@ -17,8 +17,8 @@ package types import ( "testing" @@ -4887,10 +4126,10 @@ index 1901b7af..12a4cfbf 100644 ) func TestURLValidate(t *testing.T) { -diff --git a/config/v3_6_experimental/types/verification.go b/config/v3_6_experimental/types/verification.go +diff --git a/config/v3_5/types/verification.go b/config/v3_5/types/verification.go index 5def6f04..1ef291c0 100644 ---- a/config/v3_6_experimental/types/verification.go -+++ b/config/v3_6_experimental/types/verification.go +--- a/config/v3_5/types/verification.go ++++ b/config/v3_5/types/verification.go @@ -19,7 +19,7 @@ import ( "encoding/hex" "strings" @@ -4900,10 +4139,10 @@ index 5def6f04..1ef291c0 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" -diff --git a/config/v3_6_experimental/types/verification_test.go b/config/v3_6_experimental/types/verification_test.go +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_6_experimental/types/verification_test.go -+++ b/config/v3_6_experimental/types/verification_test.go +--- a/config/v3_5/types/verification_test.go ++++ b/config/v3_5/types/verification_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" @@ -4913,6 +4152,46 @@ index 9a0914d0..f121b503 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" +diff --git a/config/v3_6_experimental/config.go b/config/v3_6_experimental/config.go +index e67b08ba..3be26cae 100644 +--- a/config/v3_6_experimental/config.go ++++ b/config/v3_6_experimental/config.go +@@ -15,13 +15,13 @@ + package v3_6_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_5" +- "github.com/coreos/ignition/v2/config/v3_6_experimental/translate" +- "github.com/coreos/ignition/v2/config/v3_6_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_5" ++ "github.com/flatcar/ignition/v2/config/v3_6_experimental/translate" ++ "github.com/flatcar/ignition/v2/config/v3_6_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_6_experimental/types/config.go b/config/v3_6_experimental/types/config.go +index 9428b0bb..4d042f54 100644 +--- a/config/v3_6_experimental/types/config.go ++++ b/config/v3_6_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/validate/validate.go b/config/validate/validate.go index 613c21e4..a8f41517 100644 --- a/config/validate/validate.go @@ -4941,6 +4220,166 @@ index 18eea933..4f77f19c 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" +diff --git a/docs/_config.yml b/docs/_config.yml +index 2e918bd0..6f51601a 100644 +--- a/docs/_config.yml ++++ b/docs/_config.yml +@@ -23,7 +23,7 @@ color_scheme: coreos + # Aux links for the upper right navigation + aux_links: + "Ignition on GitHub": +- - "https://github.com/coreos/ignition" ++ - "https://github.com/flatcar/ignition" + + footer_content: "Copyright © Red Hat, Inc. and others." + +@@ -34,7 +34,7 @@ last_edit_time_format: "%b %e %Y at %I:%M %p" + # Footer "Edit this page on GitHub" link text + gh_edit_link: true + gh_edit_link_text: "Edit this page on GitHub" +-gh_edit_repository: "https://github.com/coreos/ignition" ++gh_edit_repository: "https://github.com/flatcar/ignition" + gh_edit_branch: "main" + gh_edit_source: docs + gh_edit_view_mode: "tree" +diff --git a/docs/development.md b/docs/development.md +index e4d2b82a..43885679 100644 +--- a/docs/development.md ++++ b/docs/development.md +@@ -24,7 +24,7 @@ See also the [Ignition rationale](rationale.md). + + ### Code structure + +-The [frontend](https://github.com/coreos/ignition/tree/main/config) handles config parsing and validation which need not run on the target system. The [backend](https://github.com/coreos/ignition/tree/main/internal) performs the configuration of the target system. The frontend is a stable library API that is used by other programs, so existing frontend API cannot be changed without bumping the Ignition major version. ++The [frontend](https://github.com/flatcar/ignition/tree/main/config) handles config parsing and validation which need not run on the target system. The [backend](https://github.com/coreos/ignition/tree/main/internal) performs the configuration of the target system. The frontend is a stable library API that is used by other programs, so existing frontend API cannot be changed without bumping the Ignition major version. + + ### Adding functionality + +@@ -36,7 +36,7 @@ New functionality added to a config spec must be declarative: it must describe w + + When reprovisioning an existing node, the config may want to reuse existing disks and filesystems without reformatting them. Config directives should support detecting and reusing an existing object (RAID volume, filesystem, etc.) if its properties match those specified in the config. + +-Ignition specs should not include distro-specific functionality such as package management. Features may require support from the distro (for example, setting kernel arguments), but such features should be broadly applicable. Distro-specific options such as support for SELinux, or paths to external binaries, can be configured at build time in the [`distro`](https://github.com/coreos/ignition/blob/main/internal/distro/distro.go) package. Distro-specific glue (e.g. support for reformatting the root filesystem) should be implemented outside the Ignition codebase, in Dracut modules that run between Ignition stages (see below). ++Ignition specs should not include distro-specific functionality such as package management. Features may require support from the distro (for example, setting kernel arguments), but such features should be broadly applicable. Distro-specific options such as support for SELinux, or paths to external binaries, can be configured at build time in the [`distro`](https://github.com/flatcar/ignition/blob/main/internal/distro/distro.go) package. Distro-specific glue (e.g. support for reformatting the root filesystem) should be implemented outside the Ignition codebase, in Dracut modules that run between Ignition stages (see below). + + Ideally, functionality should not be added to an experimental spec in the same Ignition release that the spec is stabilized. Doing so prevents users from trying out the functionality before we commit to maintaining it. + +@@ -178,15 +178,15 @@ To add a blackbox test create a function which yields a `Test` object. A `Test` + + The test should be added to the init function inside of the test file. If the test module is being created then an `init` function should be created which registers the tests and the package must be imported inside of `tests/registry/registry.go` to allow for discovery. + +-UUIDs may be required in the following fields of a `Test` object: `In`, `Out`, and `Config`. Replace all GUIDs with GUID varaibles which take on the format `$uuid` (e.g. $uuid123). Where `` must be a positive integer. GUID variables with identical `` fields will be replaced with identical GUIDs. For example, look at [tests/positive/partitions/zeros.go](https://github.com/coreos/ignition/blob/main/tests/positive/partitions/zeros.go). ++UUIDs may be required in the following fields of a `Test` object: `In`, `Out`, and `Config`. Replace all GUIDs with GUID varaibles which take on the format `$uuid` (e.g. $uuid123). Where `` must be a positive integer. GUID variables with identical `` fields will be replaced with identical GUIDs. For example, look at [tests/positive/partitions/zeros.go](https://github.com/flatcar/ignition/blob/main/tests/positive/partitions/zeros.go). + + ## Releasing Ignition + +-Create a new [release checklist](https://github.com/coreos/ignition/issues/new?labels=kind/release&template=release-checklist.md) and follow the steps there. ++Create a new [release checklist](https://github.com/flatcar/ignition/issues/new?labels=kind/release&template=release-checklist.md) and follow the steps there. + + ## The build process + +-Note that the `build` script included in this repository is a convenience script only and not used for the actual release binaries. Those are built using an `ignition.spec` maintained in [Fedora rpms/ignition](https://src.fedoraproject.org/rpms/ignition). (The `ignition-validate` [container](https://quay.io/repository/coreos/ignition-validate) is built by the `build_for_container` script, which is not further described here.) ++Note that the `build` script included in this repository is a convenience script only and not used for the actual release binaries. Those are built using an `ignition.spec` maintained in [Fedora rpms/ignition](https://src.fedoraproject.org/rpms/ignition). (The `ignition-validate` [container](https://quay.io/repository/flatcar/ignition-validate) is built by the `build_for_container` script, which is not further described here.) + This build process uses the [go-rpm-macros](https://pagure.io/go-rpm-macros) to set up the Go build environment and is subject to the [Golang Packaging Guidelines](https://docs.fedoraproject.org/en-US/packaging-guidelines/Golang/). + + Consult the [Package Maintenance Guide](https://docs.fedoraproject.org/en-US/package-maintainers/Package_Maintenance_Guide/) and the [Pull Requests Guide](https://docs.fedoraproject.org/en-US/ci/pull-requests/) if you want to contribute to the build process. +@@ -195,4 +195,4 @@ In case you have trouble with the aforementioned standard Pull Request Guide, co + + ## Marking an experimental spec as stable + +-Create a new [stabilization checklist](https://github.com/coreos/ignition/issues/new?template=stabilize-checklist.md) and follow the steps there. ++Create a new [stabilization checklist](https://github.com/flatcar/ignition/issues/new?template=stabilize-checklist.md) and follow the steps there. +diff --git a/docs/distributor-notes.md b/docs/distributor-notes.md +index 23f917f4..44443d7b 100644 +--- a/docs/distributor-notes.md ++++ b/docs/distributor-notes.md +@@ -14,8 +14,8 @@ The distribution specific integration is responsible for ensuring that the ignit + + ## Kernel Arguments + +-When Ignition is updating kernel arguments it will call out to a binary (defined in `internal/distro/distro.go` and overridable at build-time via overriding the `github.com/coreos/ignition/v2/internal/distro.kargsCmd` build flag). Ignition expects that the binary accepts `--should-exist` & `--should-not-exist` parameters. Should exist operations should append the argument if missing and should not exist should NOT fail if the argument is not present. The binary should also reboot the system if necessary. ++When Ignition is updating kernel arguments it will call out to a binary (defined in `internal/distro/distro.go` and overridable at build-time via overriding the `github.com/flatcar/ignition/v2/internal/distro.kargsCmd` build flag). Ignition expects that the binary accepts `--should-exist` & `--should-not-exist` parameters. Should exist operations should append the argument if missing and should not exist should NOT fail if the argument is not present. The binary should also reboot the system if necessary. + +-As an example of the binary implementation look at [`examples/ignition-kargs-helper`](https://github.com/coreos/ignition/blob/main/examples/ignition-kargs-helper). ++As an example of the binary implementation look at [`examples/ignition-kargs-helper`](https://github.com/flatcar/ignition/blob/main/examples/ignition-kargs-helper). + +-If your implementation of Ignition doesn't intend to ship kargs functionality the [`ignition-kargs.service` unit](https://github.com/coreos/ignition/blob/main/dracut/30ignition/ignition-kargs.service) should be disabled. ++If your implementation of Ignition doesn't intend to ship kargs functionality the [`ignition-kargs.service` unit](https://github.com/flatcar/ignition/blob/main/dracut/30ignition/ignition-kargs.service) should be disabled. +diff --git a/docs/getting-started.md b/docs/getting-started.md +index 9598332b..b4cd3225 100644 +--- a/docs/getting-started.md ++++ b/docs/getting-started.md +@@ -24,12 +24,12 @@ The Linux distro may provide a base config which specifies default configuration + + ## Config Validation + +-To validate a config for Ignition there are binaries for a cli tool called `ignition-validate` available [on the releases page][releases]. There is also an ignition-validate container: `quay.io/coreos/ignition-validate`. ++To validate a config for Ignition there are binaries for a cli tool called `ignition-validate` available [on the releases page][releases]. There is also an ignition-validate container: `quay.io/flatcar/ignition-validate`. + + Example: + ``` + # This example uses podman, but docker can be used too +-podman run --pull=always --rm -i quay.io/coreos/ignition-validate:release - < myconfig.ign ++podman run --pull=always --rm -i quay.io/flatcar/ignition-validate:release - < myconfig.ign + ``` + + ## Troubleshooting +@@ -68,7 +68,7 @@ Ignition is not typically run more than once during a machine's lifetime in a gi + [firstboot]: rationale.md#ignition-runs-only-on-the-first-boot + [mime]: http://www.iana.org/assignments/media-types/application/vnd.coreos.ignition+json + [operator-notes]: operator-notes.md +-[releases]: https://github.com/coreos/ignition/releases ++[releases]: https://github.com/flatcar/ignition/releases + [platforms]: supported-platforms.md + [preset]: https://www.freedesktop.org/software/systemd/man/systemd.preset.html + [troubleshooting]: #troubleshooting +diff --git a/docs/index.md b/docs/index.md +index 8ff0fbb7..6b580509 100644 +--- a/docs/index.md ++++ b/docs/index.md +@@ -22,13 +22,13 @@ Odds are good that you don't want to invoke Ignition directly. In fact, it isn't + + - Mailing list: [coreos@lists.fedoraproject.org](https://lists.fedoraproject.org/archives/list/coreos@lists.fedoraproject.org/) + - IRC: #[fedora-coreos](ircs://irc.libera.chat:6697/#fedora-coreos) on Libera.Chat +-- Reporting bugs: [issues](https://github.com/coreos/ignition/issues/new/choose) ++- Reporting bugs: [issues](https://github.com/flatcar/ignition/issues/new/choose) + + ## Contributing + + See [CONTRIBUTING][contributing] for details on submitting patches and the contribution workflow. + +-To help triage or fix bugs, see the current [Ignition issues](https://github.com/coreos/ignition/issues/). ++To help triage or fix bugs, see the current [Ignition issues](https://github.com/flatcar/ignition/issues/). + + [getting started]: getting-started.md +-[contributing]: https://github.com/coreos/ignition/blob/main/CONTRIBUTING.md ++[contributing]: https://github.com/flatcar/ignition/blob/main/CONTRIBUTING.md +diff --git a/docs/migrating-configs.md b/docs/migrating-configs.md +index baf6f3e0..3b197239 100644 +--- a/docs/migrating-configs.md ++++ b/docs/migrating-configs.md +@@ -612,7 +612,7 @@ The networkd section has been removed. Use the files section instead. Refer to t + + ## From 2.x.0 to 2.3.0 + +-Refer to [this doc in the `spec2x`](https://github.com/coreos/ignition/tree/spec2x/doc/migrating-configs.md) branch of this repository. That doc also describes specification version 2.4.0, a parallel development which shares some enhancements with spec 3.1.0. ++Refer to [this doc in the `spec2x`](https://github.com/flatcar/ignition/tree/spec2x/doc/migrating-configs.md) branch of this repository. That doc also describes specification version 2.4.0, a parallel development which shares some enhancements with spec 3.1.0. + + [networkd-docs]: https://www.freedesktop.org/software/systemd/man/systemd-networkd.html# + [operator-notes]: operator-notes.md +diff --git a/docs/specs.md b/docs/specs.md +index 89021b3c..d8cb350b 100644 +--- a/docs/specs.md ++++ b/docs/specs.md +@@ -38,7 +38,7 @@ Ignition: + ## Legacy spec 2.x configuration specifications + + Documentation for the spec 1 and 2.x configuration specifications is available +-in the legacy [`spec2x` branch](https://github.com/coreos/ignition/tree/spec2x/doc) ++in the legacy [`spec2x` branch](https://github.com/flatcar/ignition/tree/spec2x/doc) + of Ignition. Those specification versions are used by older versions of RHEL + CoreOS and Flatcar Container Linux. This branch is no longer maintained. + diff --git a/dracut/30ignition/ignition-complete.target b/dracut/30ignition/ignition-complete.target index 6241b1d2..43a80147 100644 --- a/dracut/30ignition/ignition-complete.target @@ -5761,10 +5200,10 @@ index d5089c45..23da8ddb 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/applehv/applehv.go b/internal/providers/applehv/applehv.go -index 2fffec9c..f4117b1a 100644 +index 2fffec9c..c4c7e2f1 100644 --- a/internal/providers/applehv/applehv.go +++ b/internal/providers/applehv/applehv.go -@@ -22,11 +22,11 @@ import ( +@@ -22,12 +22,12 @@ import ( "net/http" "os/exec" @@ -5773,14 +5212,15 @@ index 2fffec9c..f4117b1a 100644 - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/v3_6_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 daabc367..b4cb36a1 100644 --- a/internal/providers/aws/aws.go @@ -5846,10 +5286,10 @@ index c00a5f61..7472f105 100644 404, // not found 410, // gone diff --git a/internal/providers/azurestack/azurestack.go b/internal/providers/azurestack/azurestack.go -index 5468bad3..69152d86 100644 +index 5468bad3..e48640f1 100644 --- a/internal/providers/azurestack/azurestack.go +++ b/internal/providers/azurestack/azurestack.go -@@ -18,10 +18,10 @@ +@@ -18,11 +18,11 @@ package azurestack import ( @@ -5857,13 +5297,14 @@ index 5468bad3..69152d86 100644 - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/azure" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/v3_6_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" ) + // These constants are the types of CDROM filesystems that might diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go index 4e75ac1f..e5872f0c 100644 --- a/internal/providers/cloudstack/cloudstack.go @@ -6017,10 +5458,10 @@ index dca9c0f9..11695d6e 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/hyperv/kvp.go b/internal/providers/hyperv/kvp.go -index 8162e506..f0bb3e9b 100644 +index 8162e506..05137a65 100644 --- a/internal/providers/hyperv/kvp.go +++ b/internal/providers/hyperv/kvp.go -@@ -20,12 +20,12 @@ import ( +@@ -20,13 +20,13 @@ import ( "path/filepath" "github.com/containers/libhvee/pkg/kvp" @@ -6030,15 +5471,16 @@ index 8162e506..f0bb3e9b 100644 - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_6_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" ) + const singleKey = "ignition.config" diff --git a/internal/providers/ibmcloud/ibmcloud.go b/internal/providers/ibmcloud/ibmcloud.go index 938ca603..ee9f73c4 100644 --- a/internal/providers/ibmcloud/ibmcloud.go @@ -6047,6 +5489,31 @@ index 938ca603..ee9f73c4 100644 "path/filepath" "time" +- "github.com/coreos/ignition/v2/config/v3_6_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_6_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/ionoscloud/ionoscloud.go b/internal/providers/ionoscloud/ionoscloud.go +index 3fd5787f..a039140c 100644 +--- a/internal/providers/ionoscloud/ionoscloud.go ++++ b/internal/providers/ionoscloud/ionoscloud.go +@@ -26,13 +26,13 @@ import ( + "path/filepath" + "time" + - "github.com/coreos/ignition/v2/config/v3_6_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" @@ -6194,31 +5661,6 @@ index 713f823e..a4ef1c25 100644 "path/filepath" "time" -- "github.com/coreos/ignition/v2/config/v3_6_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_6_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 490bfe30..cbfe7c7d 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_6_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" @@ -6356,19 +5798,6 @@ index 26f01870..929e3d1c 100644 "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 bfc424cc..421534d3 100644 --- a/internal/providers/virtualbox/virtualbox.go @@ -6446,10 +5875,10 @@ index e5111c6e..70aacc17 100644 "github.com/coreos/vcontext/report" ) diff --git a/internal/providers/zvm/zvm.go b/internal/providers/zvm/zvm.go -index 48e95ab7..622ced66 100644 +index 48e95ab7..0534623d 100644 --- a/internal/providers/zvm/zvm.go +++ b/internal/providers/zvm/zvm.go -@@ -24,13 +24,13 @@ import ( +@@ -24,14 +24,14 @@ import ( "os/exec" "strings" @@ -6460,6 +5889,7 @@ index 48e95ab7..622ced66 100644 - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" + "github.com/coreos/vcontext/report" + "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" @@ -6467,14 +5897,14 @@ index 48e95ab7..622ced66 100644 + "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" ) + const readerDevice string = "000c" diff --git a/internal/register/providers.go b/internal/register/providers.go -index bda4b7cf..eb4bd9d2 100644 +index 63249c7d..f37aa906 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go -@@ -15,31 +15,31 @@ +@@ -15,32 +15,32 @@ package register import ( @@ -6492,6 +5922,7 @@ index bda4b7cf..eb4bd9d2 100644 - _ "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/ionoscloud" - _ "github.com/coreos/ignition/v2/internal/providers/kubevirt" - _ "github.com/coreos/ignition/v2/internal/providers/metal" - _ "github.com/coreos/ignition/v2/internal/providers/nutanix" @@ -6519,6 +5950,7 @@ index bda4b7cf..eb4bd9d2 100644 + _ "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/ionoscloud" + _ "github.com/flatcar/ignition/v2/internal/providers/kubevirt" + _ "github.com/flatcar/ignition/v2/internal/providers/metal" + _ "github.com/flatcar/ignition/v2/internal/providers/nutanix" @@ -6859,21 +6291,6 @@ index 9c1960be..d5918581 100644 "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 @@ -7179,21 +6596,6 @@ index 5952097f..3c0d62dd 100644 + "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 @@ -7544,5 +6946,5 @@ index bec64866..ed027604 100644 var ( -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch index 677b1833b16..e6e73241689 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/0002-config-add-ignition-translation.patch @@ -1,20 +1,34 @@ -From 09a77afae8ede189033837888062553ff18e7290 Mon Sep 17 00:00:00 2001 +From 358dc41cf8f2f44b5b89ab10552683d3fa396792 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 26 Sep 2022 12:12:04 +0200 -Subject: [PATCH 02/20] config: add ignition translation +Subject: [PATCH 02/22] config: add ignition translation it's a merge from flatcar/ign-converter Signed-off-by: Mathieu Tortuyaux --- + build | 2 +- config/util/translate.go | 166 +++ config/v24tov31/v24tov31.go | 729 +++++++++++++ config/v24tov31/v24tov31_test.go | 1692 ++++++++++++++++++++++++++++++ - 3 files changed, 2587 insertions(+) + 4 files changed, 2588 insertions(+), 1 deletion(-) create mode 100644 config/util/translate.go create mode 100644 config/v24tov31/v24tov31.go create mode 100644 config/v24tov31/v24tov31_test.go +diff --git a/build b/build +index 4a50527c..5abdcf5f 100755 +--- a/build ++++ b/build +@@ -5,7 +5,7 @@ set -eu + export GO111MODULE=on + + NAME="ignition" +-ORG_PATH="github.com/coreos" ++ORG_PATH="github.com/flatcar" + REPO_PATH="${ORG_PATH}/${NAME}/v2" + GLDFLAGS=${GLDFLAGS:-} + export GOFLAGS=-mod=vendor diff --git a/config/util/translate.go b/config/util/translate.go new file mode 100644 index 00000000..347d148c @@ -2621,5 +2635,5 @@ index 00000000..e81f6bed + } +} -- -2.44.2 +2.43.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/0003-mod-add-flatcar-ignition-0.36.2.patch index ae6121ac99e..b373843fcd8 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/0003-mod-add-flatcar-ignition-0.36.2.patch @@ -1,17 +1,17 @@ -From b736afa1321345564c6ef6675a980b3187a085b1 Mon Sep 17 00:00:00 2001 +From 2b2d5e325a944050f17cd82a15cf766419c4a015 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Thu, 24 Oct 2024 10:19:08 +0200 -Subject: [PATCH 03/20] mod: add flatcar/ignition@0.36.2 +Date: Fri, 7 Jun 2024 09:09:18 +0200 +Subject: [PATCH 03/22] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. Signed-off-by: Mathieu Tortuyaux --- - go.mod | 4 ++++ - 1 file changed, 4 insertions(+) + go.mod | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/go.mod b/go.mod -index a22b3edb..11ea000e 100644 +index a22b3edb..69f63ef7 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( @@ -32,14 +32,6 @@ index a22b3edb..11ea000e 100644 github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.1 // indirect -@@ -53,6 +56,7 @@ require ( - go.opentelemetry.io/otel v1.24.0 // indirect - go.opentelemetry.io/otel/metric v1.24.0 // indirect - go.opentelemetry.io/otel/trace v1.24.0 // indirect -+ go4.org v0.0.0-20160314031811-03efcb870d84 // indirect - golang.org/x/crypto v0.28.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/text v0.19.0 // indirect -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch index 3acb61e0da3..5a0aeda3440 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch @@ -1,7 +1,7 @@ -From 3bd24e98f80056f32de366e87b754e3313138e25 Mon Sep 17 00:00:00 2001 +From a38cd1605b977de8804978a2a6c9631633dd4a4d Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Thu, 24 Oct 2024 10:19:25 +0200 -Subject: [PATCH 04/20] sum: go mod tidy +Date: Fri, 7 Jun 2024 09:09:50 +0200 +Subject: [PATCH 04/22] sum: go mod tidy Signed-off-by: Mathieu Tortuyaux --- @@ -143,5 +143,5 @@ index 556ebeec..d79ae2e0 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.44.2 +2.43.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/0005-vendor-go-mod-vendor.patch index c263c5a37f7..832b58b2c28 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/0005-vendor-go-mod-vendor.patch @@ -1,7 +1,7 @@ -From c051ca72c703700943c79d28b154e460ecb23db1 Mon Sep 17 00:00:00 2001 +From c4630f9868f10116355373d5a24b006f191811fa Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Thu, 24 Oct 2024 10:19:43 +0200 -Subject: [PATCH 05/20] vendor: go mod vendor +Date: Fri, 7 Jun 2024 09:10:35 +0200 +Subject: [PATCH 05/22] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux --- @@ -155,8 +155,8 @@ Signed-off-by: Mathieu Tortuyaux vendor/go4.org/AUTHORS | 8 + vendor/go4.org/LICENSE | 202 +++ vendor/go4.org/errorutil/highlight.go | 58 + - vendor/modules.txt | 30 + - 151 files changed, 15850 insertions(+) + vendor/modules.txt | 32 +- + 151 files changed, 15851 insertions(+), 1 deletion(-) create mode 100644 vendor/github.com/ajeddeloh/go-json/README create mode 100644 vendor/github.com/ajeddeloh/go-json/decode.go create mode 100644 vendor/github.com/ajeddeloh/go-json/encode.go @@ -17029,7 +17029,7 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index 0d4a188c..8ffe2ea7 100644 +index 0d4a188c..57536b55 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -36,6 +36,9 @@ cloud.google.com/go/storage @@ -17080,7 +17080,7 @@ index 0d4a188c..8ffe2ea7 100644 # github.com/go-logr/logr v1.4.1 ## explicit; go 1.18 github.com/go-logr/logr -@@ -264,6 +291,9 @@ go.opentelemetry.io/otel/metric/noop +@@ -264,8 +291,11 @@ go.opentelemetry.io/otel/metric/noop ## explicit; go 1.20 go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded @@ -17088,8 +17088,11 @@ index 0d4a188c..8ffe2ea7 100644 +## explicit +go4.org/errorutil # golang.org/x/crypto v0.28.0 - ## explicit; go 1.20 +-## explicit; go 1.20 ++## explicit; go 1.18 golang.org/x/crypto/chacha20 + golang.org/x/crypto/chacha20poly1305 + golang.org/x/crypto/cryptobyte -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch new file mode 100644 index 00000000000..7d3151e2fce --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch @@ -0,0 +1,76 @@ +From 2c91043cc1181596c363341ee5b974808b6cc44d Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Wed, 25 May 2022 10:20:09 +0200 +Subject: [PATCH 06/22] config/v3_5: convert ignition 2.x to 3.x + +if the version of ignition is 2.x we convert it to 3.x using +ign-converter. + +it should support any 2.x version (or at the least the last 2 releases) + +Signed-off-by: Mathieu Tortuyaux +--- + config/v3_6_experimental/config.go | 37 ++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) + +diff --git a/config/v3_6_experimental/config.go b/config/v3_6_experimental/config.go +index 3be26cae..ea367663 100644 +--- a/config/v3_6_experimental/config.go ++++ b/config/v3_6_experimental/config.go +@@ -15,9 +15,14 @@ + package v3_6_experimental + + import ( ++ "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_5" + "github.com/flatcar/ignition/v2/config/v3_6_experimental/translate" + "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" +@@ -67,6 +72,38 @@ func ParseCompatibleVersion(raw []byte) (types.Config, report.Report, error) { + return types.Config{}, rpt, err + } + ++ // if the version is 2.x or 1.x, we ++ // convert it to 3.1 ++ if version.Major != 3 { ++ // Parse should fallback on every 2.x supported version ++ cfg, _, err := v2_4.Parse(raw) ++ if err != nil || rpt.IsFatal() { ++ return types.Config{}, report.Report{}, fmt.Errorf("unable to parse 2.x ignition: %w", err) ++ } ++ ++ /* ++ map[string]string{} is required by the ign-converter ++ Ignition Spec 3 will mount filesystems at the mountpoint specified by path when running. ++ Filesystems no longer have the name field and files, links, and directories no longer specify the filesystem by name. ++ This means to translate filesystems (with the exception of root), ++ you must also provide a mapping of filesystem name to absolute path, e.g. ++ ``` ++ map[string]string{"var": "/var"} ++ ``` ++ */ ++ newCfg, err := v24tov31.Translate(cfg, map[string]string{}) ++ if err != nil { ++ return types.Config{}, report.Report{}, fmt.Errorf("unable to translate 2.x ignition to 3.1: %w", err) ++ ++ } ++ ++ // update raw in place to continue with the 3.x logic ++ raw, err = json.Marshal(newCfg) ++ if err != nil { ++ return types.Config{}, report.Report{}, fmt.Errorf("unable to render JSON: %w", err) ++ } ++ } ++ + if version == types.MaxVersion { + return Parse(raw) + } +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch index 9133fb330e6..fc3666ab4c5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch @@ -1,7 +1,7 @@ -From 2f5a68dc1c780e1e8647951e1e15c78d569b6ac4 Mon Sep 17 00:00:00 2001 +From 20010d9ad2ac1f9ffad7c1615deaacf0fc27d245 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 19 Feb 2024 18:12:22 +0100 -Subject: [PATCH 07/20] internal/prv/cmdline: backport flatcar patch +Subject: [PATCH 07/22] internal/prv/cmdline: backport flatcar patch this patch provides backward compatibility for various config key @@ -36,5 +36,5 @@ index 30203bff..86a5cb79 100644 } -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch index 0957b916f71..2c8341c3693 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch @@ -1,27 +1,29 @@ -From 41e66c950879d3b1cddd2a80a48dbd3bf35413f4 Mon Sep 17 00:00:00 2001 +From b349dcbf3563c7b9c71858be1a3f582e26b269e7 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:02:28 +0100 -Subject: [PATCH 08/20] provider/qemu: apply fw_cfg patch +Subject: [PATCH 08/22] 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 | 118 ++++++++++++++------------ - 1 file changed, 63 insertions(+), 55 deletions(-) + internal/providers/qemu/qemu_fwcfg.go | 120 ++++++++++++++------------ + 1 file changed, 64 insertions(+), 56 deletions(-) diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go -index 389ec119..cab9c476 100644 +index 389ec119..e233865a 100644 --- a/internal/providers/qemu/qemu_fwcfg.go +++ b/internal/providers/qemu/qemu_fwcfg.go -@@ -29,6 +29,7 @@ import ( +@@ -29,7 +29,8 @@ import ( "strings" "time" +- "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + iErrors "github.com/flatcar/ignition/v2/config/shared/errors" - "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" "github.com/flatcar/ignition/v2/internal/distro" "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" @@ -38,9 +39,11 @@ import ( "github.com/coreos/vcontext/report" ) @@ -159,5 +161,5 @@ index 389ec119..cab9c476 100644 + } -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch new file mode 100644 index 00000000000..438652b35b5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch @@ -0,0 +1,44 @@ +From 3563a694333cec6b5d48e3b24d58460369d72337 Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Thu, 2 Sep 2021 11:03:17 +0200 +Subject: [PATCH 09/22] config/3_5/test: add ignition 2.x test cases + +Signed-off-by: Mathieu Tortuyaux +--- + config/v3_5/config_test.go | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/config/v3_5/config_test.go b/config/v3_5/config_test.go +index 425eb544..88e5d2d6 100644 +--- a/config/v3_5/config_test.go ++++ b/config/v3_5/config_test.go +@@ -161,6 +161,26 @@ func TestParse(t *testing.T) { + in in + out out + }{ ++ { ++ in: in{config: []byte(`{"ignition": {"version": "2.0.0"}}`)}, ++ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, ++ }, ++ { ++ in: in{config: []byte(`{"ignition": {"version": "2.1.0"}}`)}, ++ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, ++ }, ++ { ++ in: in{config: []byte(`{"ignition": {"version": "2.2.0"}}`)}, ++ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, ++ }, ++ { ++ in: in{config: []byte(`{"ignition": {"version": "2.3.0"}}`)}, ++ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, ++ }, ++ { ++ in: in{config: []byte(`{"ignition": {"version": "2.4.0"}}`)}, ++ out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, ++ }, + { + in: in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)}, + out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}}, +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index a4e5079acc0..3a78e8811c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch @@ -1,7 +1,7 @@ -From c64bfd1cfa7992396609ad55b1e3dba29ce4026c Mon Sep 17 00:00:00 2001 +From a10e49004615f119d63dc1bf2c751489529465b3 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 -Subject: [PATCH 10/20] internal/disk/fs: ignore fs format mismatches for the +Subject: [PATCH 10/22] internal/disk/fs: ignore fs format mismatches for the OEM partition As soon as the OEM partition's filesystem format changes, all users @@ -35,5 +35,5 @@ index c575ced4..fefd1fff 100644 (fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) { s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device) -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index ae2ce4ba8d1..df85fcdc79f 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,7 +1,7 @@ -From 0bcc2592c3809a86c7649cd667bd481e5526af2e Mon Sep 17 00:00:00 2001 +From 30f317e5abb48225a74b2114355a21d871f20f35 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:12:02 +0100 -Subject: [PATCH 11/20] VMware: Fix guestinfo.*.config.data and *.config.url +Subject: [PATCH 11/22] VMware: Fix guestinfo.*.config.data and *.config.url variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -164,5 +164,5 @@ index 597c33fd..3680a4cd 100644 func delConfig(f *resource.Fetcher) error { -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch index c3fc850f1e3..16bebe9595c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch @@ -1,7 +1,7 @@ -From 6f4ae547913ed6be8801ec17fd91f3ce0769d34e Mon Sep 17 00:00:00 2001 +From cf0edd978eff88798571e19856e874fd877eed90 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 -Subject: [PATCH 12/20] config/version: handle configuration version 1 +Subject: [PATCH 12/22] 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 @@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644 return semver.Version{}, report.Report{}, errors.ErrInvalidVersion } -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch index 540e5176393..17e3a61f571 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -1,7 +1,7 @@ -From 94514a6ea6842dc32ab5ec82c63455797a946949 Mon Sep 17 00:00:00 2001 +From ae4eb1643cf8db131bbc89c25efd9bf0e8b00368 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 -Subject: [PATCH 13/20] config/util: add cloud init detection to initial +Subject: [PATCH 13/22] config/util: add cloud init detection to initial parsing we detect if the config is not an ignition one (script/cloudinit) and we @@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644 if err == nil { return report.Report{}, nil -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch index 15bf3864168..4921dc36ae4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch @@ -1,7 +1,7 @@ -From 35bd1887b3d2837efbcee3de52e567c7d76e6669 Mon Sep 17 00:00:00 2001 +From e0e5fa1ebbd9ed0196c6e25aeb9543439c636df1 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:38:16 +0200 -Subject: [PATCH 14/20] Revert "*: drop OEM URI support" +Subject: [PATCH 14/22] Revert "*: drop OEM URI support" This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. --- @@ -81,7 +81,7 @@ index 9b2b4405..5258c3c6 100644 case "s3": if v, ok := u.Query()["versionId"]; ok { diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md -index eef319b2..21ad376e 100644 +index 4380c706..4ce05974 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -12,6 +12,7 @@ Ignition is currently supported for the following platforms: @@ -271,5 +271,5 @@ index 4f55dc2b..469857d0 100644 + ) +} -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch index a95e2b0225c..52edc7096b4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch @@ -1,7 +1,7 @@ -From de8ca35ae723b43509cddc5e48fc0b0c67464b1a Mon Sep 17 00:00:00 2001 +From 079f0aff628f0e4d7778ffabaedb1bf934f98bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 7 Jul 2021 18:40:52 +0200 -Subject: [PATCH 15/20] internal/resource/url: support btrfs as OEM partition +Subject: [PATCH 15/22] internal/resource/url: support btrfs as OEM partition filesystem When btrfs is used to fit more content into the partition, mounting @@ -35,5 +35,5 @@ index 469857d0..0457c15f 100644 return nil -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch index f79bd94a7a8..bdf17d18b1e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch @@ -1,7 +1,7 @@ -From 3f816cd80b0f312ce42f475ef3944cf0ba54bd5b Mon Sep 17 00:00:00 2001 +From ebea4aa03b44d6a22189d516a4e2e87e5981ff0c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 -Subject: [PATCH 16/20] translation: support OEM and oem +Subject: [PATCH 16/22] translation: support OEM and oem Signed-off-by: Mathieu Tortuyaux --- @@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644 + } +} -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch index ab86893921a..b9bbf998b5d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch @@ -1,7 +1,7 @@ -From 79df02821be2a0d942662ccadfe2233cde41955f Mon Sep 17 00:00:00 2001 +From db039171edd45fd41d48a818e48c164686846d8a Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:25:24 +0100 -Subject: [PATCH 17/20] revert: internal/oem: drop noop OEMs +Subject: [PATCH 17/22] revert: internal/oem: drop noop OEMs This reverts: https://github.com/flatcar/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132 @@ -42,5 +42,5 @@ index 27c923d4..ae259f8f 100644 func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch index 410c22f3c3f..18ecc08f542 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch @@ -1,7 +1,7 @@ -From eb5bb6977caec2b38f77f63fa772720d4f2fc11e Mon Sep 17 00:00:00 2001 +From 1f25f6c5b4f3c30c20df33f0db30ddb0aa9d1ae6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 4 Mar 2024 15:05:14 +0100 -Subject: [PATCH 18/20] docs: Add re-added platforms to docs to pass tests +Subject: [PATCH 18/22] docs: Add re-added platforms to docs to pass tests Signed-off-by: Mathieu Tortuyaux Co-Authored-By: Krzesimir Nowak Date: Tue, 4 Apr 2023 12:12:42 +0200 -Subject: [PATCH 19/20] /usr/share/oem -> /oem +Subject: [PATCH 19/22] /usr/share/oem -> /oem --- config/util/translate.go | 2 +- @@ -38,5 +38,5 @@ index 2726d705..c335eeee 100644 // Helper programs -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch index a2f48762b77..beb6862c352 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch @@ -1,7 +1,7 @@ -From c62391465f02cbb053e0bb24b8201dc6c89a9cdf Mon Sep 17 00:00:00 2001 +From 98499b9ba59d1a104f137b3dc34e600b953167d8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 -Subject: [PATCH 20/20] internal/exec/stages/mount: Mount /oem +Subject: [PATCH 20/22] 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 @@ -28,5 +28,5 @@ index bace4bbd..bc6767d2 100644 if err := checkForNonDirectories(path); err != nil { return err -- -2.44.2 +2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-akamai-fix-base64-decoding.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-akamai-fix-base64-decoding.patch new file mode 100644 index 00000000000..5549a432b06 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-akamai-fix-base64-decoding.patch @@ -0,0 +1,31 @@ +From 2b1fce171c620faccad2cd865e089d9c323245df Mon Sep 17 00:00:00 2001 +From: Mathieu Tortuyaux +Date: Mon, 24 Jun 2024 16:38:09 +0200 +Subject: [PATCH 21/22] akamai: fix base64 decoding + +trailing \x00 character was making Ignition to fail parsing the config. +It is not always the case, that is why we did not catch it earlier: when +there is no padding in the base64 payload, everything was working. + +https://pkg.go.dev/encoding/base64#Encoding.Decode + +Signed-off-by: Mathieu Tortuyaux +--- + docs/release-notes.md | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs/release-notes.md b/docs/release-notes.md +index 2af86c89..4d42e9d5 100644 +--- a/docs/release-notes.md ++++ b/docs/release-notes.md +@@ -14,6 +14,7 @@ nav_order: 9 + + ### Bug fixes + ++- Fixed Akamai Ignition base64 decoding + + ## Ignition 2.20.0 (2024-10-22) + +-- +2.43.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-another-sed-s-coreos-flatcar.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-another-sed-s-coreos-flatcar.patch new file mode 100644 index 00000000000..9e77625c8e9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0022-another-sed-s-coreos-flatcar.patch @@ -0,0 +1,819 @@ +From 30c07d6c253c871cb5842976af3b14189d93ead8 Mon Sep 17 00:00:00 2001 +From: Jan Larwig +Date: Mon, 4 Nov 2024 09:43:04 +0100 +Subject: [PATCH 22/22] another *: sed `s/coreos/flatcar/` + +--- + config/v3_5/config.go | 14 +++++++------- + config/v3_5/types/config.go | 4 ++-- + config/v3_6_experimental/config_test.go | 4 ++-- + config/v3_6_experimental/translate/translate.go | 6 +++--- + .../v3_6_experimental/translate/translate_test.go | 4 ++-- + config/v3_6_experimental/types/cex.go | 2 +- + config/v3_6_experimental/types/cex_test.go | 2 +- + config/v3_6_experimental/types/clevis.go | 4 ++-- + config/v3_6_experimental/types/clevis_test.go | 4 ++-- + config/v3_6_experimental/types/config_test.go | 4 ++-- + config/v3_6_experimental/types/disk.go | 4 ++-- + config/v3_6_experimental/types/file.go | 4 ++-- + config/v3_6_experimental/types/file_test.go | 4 ++-- + config/v3_6_experimental/types/filesystem.go | 4 ++-- + config/v3_6_experimental/types/filesystem_test.go | 4 ++-- + config/v3_6_experimental/types/headers.go | 2 +- + config/v3_6_experimental/types/headers_test.go | 2 +- + config/v3_6_experimental/types/ignition.go | 2 +- + config/v3_6_experimental/types/kargs_test.go | 2 +- + config/v3_6_experimental/types/luks.go | 4 ++-- + config/v3_6_experimental/types/mode.go | 2 +- + config/v3_6_experimental/types/mode_test.go | 4 ++-- + config/v3_6_experimental/types/node.go | 4 ++-- + config/v3_6_experimental/types/node_test.go | 4 ++-- + config/v3_6_experimental/types/partition.go | 4 ++-- + config/v3_6_experimental/types/partition_test.go | 4 ++-- + config/v3_6_experimental/types/path.go | 4 ++-- + config/v3_6_experimental/types/path_test.go | 2 +- + config/v3_6_experimental/types/proxy.go | 2 +- + config/v3_6_experimental/types/proxy_test.go | 4 ++-- + config/v3_6_experimental/types/raid.go | 4 ++-- + config/v3_6_experimental/types/raid_test.go | 4 ++-- + config/v3_6_experimental/types/resource.go | 4 ++-- + config/v3_6_experimental/types/storage.go | 4 ++-- + config/v3_6_experimental/types/storage_test.go | 4 ++-- + config/v3_6_experimental/types/systemd.go | 6 +++--- + config/v3_6_experimental/types/systemd_test.go | 4 ++-- + config/v3_6_experimental/types/tang.go | 4 ++-- + config/v3_6_experimental/types/tang_test.go | 4 ++-- + config/v3_6_experimental/types/unit.go | 8 ++++---- + config/v3_6_experimental/types/unit_test.go | 4 ++-- + config/v3_6_experimental/types/url.go | 4 ++-- + config/v3_6_experimental/types/url_test.go | 4 ++-- + config/v3_6_experimental/types/verification.go | 2 +- + .../v3_6_experimental/types/verification_test.go | 2 +- + internal/providers/proxmoxve/proxmoxve.go | 14 +++++++------- + internal/providers/qemu/qemu_fwcfg.go | 2 +- + internal/providers/util/unzip_test.go | 2 +- + tests/negative/luks/creation.go | 4 ++-- + tests/positive/luks/creation.go | 4 ++-- + 50 files changed, 101 insertions(+), 101 deletions(-) + +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/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_6_experimental/config_test.go b/config/v3_6_experimental/config_test.go +index 8ba56163..54cbd91c 100644 +--- a/config/v3_6_experimental/config_test.go ++++ b/config/v3_6_experimental/config_test.go +@@ -17,8 +17,8 @@ package v3_6_experimental + import ( + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + "github.com/stretchr/testify/assert" + ) + +diff --git a/config/v3_6_experimental/translate/translate.go b/config/v3_6_experimental/translate/translate.go +index bf3f11e9..a0755bb4 100644 +--- a/config/v3_6_experimental/translate/translate.go ++++ b/config/v3_6_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_5/types" +- "github.com/coreos/ignition/v2/config/v3_6_experimental/types" ++ "github.com/flatcar/ignition/v2/config/translate" ++ old_types "github.com/flatcar/ignition/v2/config/v3_5/types" ++ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + ) + + func translateIgnition(old old_types.Ignition) (ret types.Ignition) { +diff --git a/config/v3_6_experimental/translate/translate_test.go b/config/v3_6_experimental/translate/translate_test.go +index fc9e3de5..cc041bdc 100644 +--- a/config/v3_6_experimental/translate/translate_test.go ++++ b/config/v3_6_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_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_experimental/types/cex.go b/config/v3_6_experimental/types/cex.go +index b34f5f52..6f58b373 100644 +--- a/config/v3_6_experimental/types/cex.go ++++ b/config/v3_6_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_6_experimental/types/cex_test.go b/config/v3_6_experimental/types/cex_test.go +index 35d562d8..e856a93f 100644 +--- a/config/v3_6_experimental/types/cex_test.go ++++ b/config/v3_6_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_6_experimental/types/clevis.go b/config/v3_6_experimental/types/clevis.go +index 68887d43..564154f6 100644 +--- a/config/v3_6_experimental/types/clevis.go ++++ b/config/v3_6_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_6_experimental/types/clevis_test.go b/config/v3_6_experimental/types/clevis_test.go +index f616868c..c28509ee 100644 +--- a/config/v3_6_experimental/types/clevis_test.go ++++ b/config/v3_6_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_6_experimental/types/config_test.go b/config/v3_6_experimental/types/config_test.go +index 3d82627b..511c5ecd 100644 +--- a/config/v3_6_experimental/types/config_test.go ++++ b/config/v3_6_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_6_experimental/types/disk.go b/config/v3_6_experimental/types/disk.go +index 8caf8499..29fd3900 100644 +--- a/config/v3_6_experimental/types/disk.go ++++ b/config/v3_6_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_6_experimental/types/file.go b/config/v3_6_experimental/types/file.go +index 9b71bb26..e3f7fbdf 100644 +--- a/config/v3_6_experimental/types/file.go ++++ b/config/v3_6_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_6_experimental/types/file_test.go b/config/v3_6_experimental/types/file_test.go +index 449e0700..5aa2e87c 100644 +--- a/config/v3_6_experimental/types/file_test.go ++++ b/config/v3_6_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_6_experimental/types/filesystem.go b/config/v3_6_experimental/types/filesystem.go +index c722b363..9f7f8bbc 100644 +--- a/config/v3_6_experimental/types/filesystem.go ++++ b/config/v3_6_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_6_experimental/types/filesystem_test.go b/config/v3_6_experimental/types/filesystem_test.go +index 1f8db903..6e710426 100644 +--- a/config/v3_6_experimental/types/filesystem_test.go ++++ b/config/v3_6_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_6_experimental/types/headers.go b/config/v3_6_experimental/types/headers.go +index be1aadad..4ad13bf9 100644 +--- a/config/v3_6_experimental/types/headers.go ++++ b/config/v3_6_experimental/types/headers.go +@@ -17,9 +17,9 @@ package types + import ( + "net/http" + +- "github.com/coreos/ignition/v2/config/shared/errors" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" ++ "github.com/flatcar/ignition/v2/config/shared/errors" + ) + + // Parse generates standard net/http headers from the data in HTTPHeaders +diff --git a/config/v3_6_experimental/types/headers_test.go b/config/v3_6_experimental/types/headers_test.go +index 40380b68..5e888830 100644 +--- a/config/v3_6_experimental/types/headers_test.go ++++ b/config/v3_6_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_6_experimental/types/ignition.go b/config/v3_6_experimental/types/ignition.go +index 190445bd..1fbcf8c4 100644 +--- a/config/v3_6_experimental/types/ignition.go ++++ b/config/v3_6_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_6_experimental/types/kargs_test.go b/config/v3_6_experimental/types/kargs_test.go +index 1a258727..a79c037a 100644 +--- a/config/v3_6_experimental/types/kargs_test.go ++++ b/config/v3_6_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_6_experimental/types/luks.go b/config/v3_6_experimental/types/luks.go +index e4c1d681..ce9d087f 100644 +--- a/config/v3_6_experimental/types/luks.go ++++ b/config/v3_6_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_6_experimental/types/mode.go b/config/v3_6_experimental/types/mode.go +index 9eb7573d..67c7ebd3 100644 +--- a/config/v3_6_experimental/types/mode.go ++++ b/config/v3_6_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_6_experimental/types/mode_test.go b/config/v3_6_experimental/types/mode_test.go +index 8966e25d..5c973dbf 100644 +--- a/config/v3_6_experimental/types/mode_test.go ++++ b/config/v3_6_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_6_experimental/types/node.go b/config/v3_6_experimental/types/node.go +index 248276e7..f4e94f9e 100644 +--- a/config/v3_6_experimental/types/node.go ++++ b/config/v3_6_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_6_experimental/types/node_test.go b/config/v3_6_experimental/types/node_test.go +index 20ba4eb6..9176b4b7 100644 +--- a/config/v3_6_experimental/types/node_test.go ++++ b/config/v3_6_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_6_experimental/types/partition.go b/config/v3_6_experimental/types/partition.go +index 1b2d97ed..6603af3b 100644 +--- a/config/v3_6_experimental/types/partition.go ++++ b/config/v3_6_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_6_experimental/types/partition_test.go b/config/v3_6_experimental/types/partition_test.go +index a1e1623f..9f8e7997 100644 +--- a/config/v3_6_experimental/types/partition_test.go ++++ b/config/v3_6_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_6_experimental/types/path.go b/config/v3_6_experimental/types/path.go +index 131e300c..cb48e341 100644 +--- a/config/v3_6_experimental/types/path.go ++++ b/config/v3_6_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_6_experimental/types/path_test.go b/config/v3_6_experimental/types/path_test.go +index 3d199cbd..33b2d0ba 100644 +--- a/config/v3_6_experimental/types/path_test.go ++++ b/config/v3_6_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_6_experimental/types/proxy.go b/config/v3_6_experimental/types/proxy.go +index d48d210a..de146a99 100644 +--- a/config/v3_6_experimental/types/proxy.go ++++ b/config/v3_6_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_6_experimental/types/proxy_test.go b/config/v3_6_experimental/types/proxy_test.go +index 269f4fb2..3cc5e5cd 100644 +--- a/config/v3_6_experimental/types/proxy_test.go ++++ b/config/v3_6_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_6_experimental/types/raid.go b/config/v3_6_experimental/types/raid.go +index 9d69aa36..fa1d3f4d 100644 +--- a/config/v3_6_experimental/types/raid.go ++++ b/config/v3_6_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_6_experimental/types/raid_test.go b/config/v3_6_experimental/types/raid_test.go +index 7323b26f..313b4572 100644 +--- a/config/v3_6_experimental/types/raid_test.go ++++ b/config/v3_6_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_6_experimental/types/resource.go b/config/v3_6_experimental/types/resource.go +index 68da6c7b..6ea74d3d 100644 +--- a/config/v3_6_experimental/types/resource.go ++++ b/config/v3_6_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_6_experimental/types/storage.go b/config/v3_6_experimental/types/storage.go +index 20cb7304..552749e6 100644 +--- a/config/v3_6_experimental/types/storage.go ++++ b/config/v3_6_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_6_experimental/types/storage_test.go b/config/v3_6_experimental/types/storage_test.go +index 551688a2..6c35ed27 100644 +--- a/config/v3_6_experimental/types/storage_test.go ++++ b/config/v3_6_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_6_experimental/types/systemd.go b/config/v3_6_experimental/types/systemd.go +index ac521ba7..818959f4 100644 +--- a/config/v3_6_experimental/types/systemd.go ++++ b/config/v3_6_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_6_experimental/types/systemd_test.go b/config/v3_6_experimental/types/systemd_test.go +index 798eb10f..d4a4be01 100644 +--- a/config/v3_6_experimental/types/systemd_test.go ++++ b/config/v3_6_experimental/types/systemd_test.go +@@ -18,10 +18,10 @@ import ( + "fmt" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" ++ "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_6_experimental/types/tang.go b/config/v3_6_experimental/types/tang.go +index 1839d6cc..26c155e5 100644 +--- a/config/v3_6_experimental/types/tang.go ++++ b/config/v3_6_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_6_experimental/types/tang_test.go b/config/v3_6_experimental/types/tang_test.go +index fb57b1e4..6f31fd99 100644 +--- a/config/v3_6_experimental/types/tang_test.go ++++ b/config/v3_6_experimental/types/tang_test.go +@@ -18,10 +18,10 @@ import ( + "reflect" + "testing" + +- "github.com/coreos/ignition/v2/config/shared/errors" +- "github.com/coreos/ignition/v2/config/util" + "github.com/coreos/vcontext/path" + "github.com/coreos/vcontext/report" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" + ) + + func TestTangValidation(t *testing.T) { +diff --git a/config/v3_6_experimental/types/unit.go b/config/v3_6_experimental/types/unit.go +index c5ee1e8e..5a9c3b22 100644 +--- a/config/v3_6_experimental/types/unit.go ++++ b/config/v3_6_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_6_experimental/types/unit_test.go b/config/v3_6_experimental/types/unit_test.go +index 3dc90540..8c96dfba 100644 +--- a/config/v3_6_experimental/types/unit_test.go ++++ b/config/v3_6_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_6_experimental/types/url.go b/config/v3_6_experimental/types/url.go +index 3ca189da..9b2b4405 100644 +--- a/config/v3_6_experimental/types/url.go ++++ b/config/v3_6_experimental/types/url.go +@@ -21,8 +21,8 @@ import ( + "github.com/aws/aws-sdk-go/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_experimental/types/url_test.go b/config/v3_6_experimental/types/url_test.go +index 1901b7af..12a4cfbf 100644 +--- a/config/v3_6_experimental/types/url_test.go ++++ b/config/v3_6_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_6_experimental/types/verification.go b/config/v3_6_experimental/types/verification.go +index 5def6f04..1ef291c0 100644 +--- a/config/v3_6_experimental/types/verification.go ++++ b/config/v3_6_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_6_experimental/types/verification_test.go b/config/v3_6_experimental/types/verification_test.go +index 9a0914d0..f121b503 100644 +--- a/config/v3_6_experimental/types/verification_test.go ++++ b/config/v3_6_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/internal/providers/proxmoxve/proxmoxve.go b/internal/providers/proxmoxve/proxmoxve.go +index b0dbb481..58525c50 100644 +--- a/internal/providers/proxmoxve/proxmoxve.go ++++ b/internal/providers/proxmoxve/proxmoxve.go +@@ -27,13 +27,13 @@ import ( + "path/filepath" + "time" + +- "github.com/coreos/ignition/v2/config/v3_6_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_6_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_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go +index e233865a..cab9c476 100644 +--- a/internal/providers/qemu/qemu_fwcfg.go ++++ b/internal/providers/qemu/qemu_fwcfg.go +@@ -30,7 +30,7 @@ import ( + "time" + + iErrors "github.com/flatcar/ignition/v2/config/shared/errors" +- "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_6_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" +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/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/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() { +-- +2.43.0 + 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 5572d380a41..c95c5683068 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 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -EGIT_REPO_URI="https://github.com/coreos/ignition.git" +EGIT_REPO_URI="https://github.com/mcbenjemaa/ignition.git" COREOS_GO_PACKAGE="github.com/flatcar/ignition/v2" COREOS_GO_GO111MODULE="off" inherit coreos-go git-r3 systemd udev @@ -10,7 +10,7 @@ inherit coreos-go git-r3 systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - EGIT_COMMIT="488d302a0863ede5b723aea4ddd558f96e318569" # v2.20.0 + EGIT_COMMIT="488d302a0863ede5b723aea4ddd558f96e318569" # main KEYWORDS="amd64 arm64" fi @@ -60,6 +60,8 @@ PATCHES=( "${FILESDIR}/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch" "${FILESDIR}/0019-usr-share-oem-oem.patch" "${FILESDIR}/0020-internal-exec-stages-mount-Mount-oem.patch" + "${FILESDIR}/0021-akamai-fix-base64-decoding.patch" + "${FILESDIR}/0022-another-sed-s-coreos-flatcar.patch" ) src_compile() {