diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch index c44a07f686..d9c5cf44f7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar-linux.patch @@ -1,7 +1,7 @@ From 68f056c7c8d36234ca7fd5e6ad2eb55ed1f557e6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:09:37 +0200 -Subject: [PATCH 01/15] *: sed `s/coreos/flatcar-linux/` +Subject: [PATCH 01/15] *: sed `s/coreos/flatcar/` Signed-off-by: Mathieu Tortuyaux --- @@ -314,7 +314,7 @@ index dba50388..3fe7eb93 100755 NAME="ignition" -ORG_PATH="github.com/coreos" -+ORG_PATH="github.com/flatcar-linux" ++ORG_PATH="github.com/flatcar" REPO_PATH="${ORG_PATH}/${NAME}/v2" GLDFLAGS=${GLDFLAGS:-} export GOFLAGS=-mod=vendor @@ -323,7 +323,7 @@ index dba50388..3fe7eb93 100755 fi -GLDFLAGS+="-X github.com/coreos/ignition/v2/internal/version.Raw=${VERSION}" -+GLDFLAGS+="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${VERSION}" ++GLDFLAGS+="-X github.com/flatcar/ignition/v2/internal/version.Raw=${VERSION}" eval $(go env) @@ -337,8 +337,8 @@ index 3ded9022..578f7fc6 100644 import ( - exp "github.com/coreos/ignition/v2/config/v3_4_experimental" - types_exp "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ exp "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental" -+ types_exp "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ exp "github.com/flatcar/ignition/v2/config/v3_4_experimental" ++ types_exp "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" "github.com/coreos/vcontext/report" ) @@ -356,12 +356,12 @@ index c39f85ca..85065c97 100644 - v3_2 "github.com/coreos/ignition/v2/config/v3_2/types" - v3_3 "github.com/coreos/ignition/v2/config/v3_3/types" - v3_4 "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ v3_0 "github.com/flatcar-linux/ignition/v2/config/v3_0/types" -+ v3_1 "github.com/flatcar-linux/ignition/v2/config/v3_1/types" -+ v3_2 "github.com/flatcar-linux/ignition/v2/config/v3_2/types" -+ v3_3 "github.com/flatcar-linux/ignition/v2/config/v3_3/types" -+ v3_4 "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ v3_0 "github.com/flatcar/ignition/v2/config/v3_0/types" ++ v3_1 "github.com/flatcar/ignition/v2/config/v3_1/types" ++ v3_2 "github.com/flatcar/ignition/v2/config/v3_2/types" ++ v3_3 "github.com/flatcar/ignition/v2/config/v3_3/types" ++ v3_4 "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) type typeSet map[reflect.Type]struct{} @@ -374,7 +374,7 @@ index 1ba91b3d..4a6ebeab 100644 "strings" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/vcontext/path" ) @@ -383,7 +383,7 @@ index 1ba91b3d..4a6ebeab 100644 // we're not supposed to have struct pointers, but some // ended up in the Clevis and Luks structs in spec 3.2.0 - // https://github.com/coreos/ignition/issues/1132 -+ // https://github.com/flatcar-linux/ignition/issues/1132 ++ // https://github.com/flatcar/ignition/issues/1132 resultField.Set(mergeStruct(parentField.Elem(), parentFieldPath, childField.Elem(), childFieldPath, resultFieldPath, transcript).Addr()) transcribeOne(parentFieldPath, resultFieldPath, transcript) transcribeOne(childFieldPath, resultFieldPath, transcript) @@ -392,7 +392,7 @@ index 1ba91b3d..4a6ebeab 100644 // we're not supposed to have struct pointers, but some // ended up in the Clevis and Luks structs in spec 3.2.0 - // https://github.com/coreos/ignition/issues/1132 -+ // https://github.com/flatcar-linux/ignition/issues/1132 ++ // https://github.com/flatcar/ignition/issues/1132 return transcribe(fromPath, toPath, value.Elem(), fieldMeta, transcript) } transcribeOne(fromPath, toPath, transcript) @@ -407,9 +407,9 @@ index 4555a7a9..69dd9e59 100644 - "github.com/coreos/ignition/v2/config/util" - v3_2 "github.com/coreos/ignition/v2/config/v3_2/types" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ v3_2 "github.com/flatcar-linux/ignition/v2/config/v3_2/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ v3_2 "github.com/flatcar/ignition/v2/config/v3_2/types" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" "github.com/coreos/vcontext/path" "github.com/stretchr/testify/assert" @@ -418,7 +418,7 @@ index 4555a7a9..69dd9e59 100644 // pointers. These should not exist but ended up in the Clevis & Luks // structs in spec 3.2.0. -// https://github.com/coreos/ignition/issues/1132 -+// https://github.com/flatcar-linux/ignition/issues/1132 ++// https://github.com/flatcar/ignition/issues/1132 func TestMergeStructPointers(t *testing.T) { type test struct { in1 v3_2.Config @@ -431,7 +431,7 @@ index 57744c31..36fa3612 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/go-systemd/v22/unit" ) @@ -444,7 +444,7 @@ index 05d8ce2c..ee4183a7 100644 "reflect" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" ) /* @@ -458,8 +458,8 @@ index 5d1adda9..b0ae0855 100644 - "github.com/coreos/ignition/v2/config/translate/tests/pkga" - "github.com/coreos/ignition/v2/config/translate/tests/pkgb" -+ "github.com/flatcar-linux/ignition/v2/config/translate/tests/pkga" -+ "github.com/flatcar-linux/ignition/v2/config/translate/tests/pkgb" ++ "github.com/flatcar/ignition/v2/config/translate/tests/pkga" ++ "github.com/flatcar/ignition/v2/config/translate/tests/pkgb" ) // Note: we need different input and output types which unfortunately means a lot of tests @@ -472,7 +472,7 @@ index 85cd7fa7..9fb88d8e 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -485,7 +485,7 @@ index 2af85e2b..5e2b4a2b 100644 "encoding/json" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -502,11 +502,11 @@ index ca32f7ad..851b26b1 100644 - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/ignition/v2/config/v3_0/types" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/merge" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_0/types" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/merge" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_0/types" ++ "github.com/flatcar/ignition/v2/config/validate" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -520,8 +520,8 @@ index f26d98c4..6e1ea5d7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_0/types" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_0/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_0/types" "github.com/stretchr/testify/assert" ) @@ -535,8 +535,8 @@ index bbb073ab..3137b652 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -550,8 +550,8 @@ index 5fa9ca8b..fee8d209 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -565,8 +565,8 @@ index ca0e3582..1e0e4cac 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFileValidateOverwrite(t *testing.T) { @@ -580,8 +580,8 @@ index 08d1e8ef..55ff45d8 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -595,8 +595,8 @@ index 93b1bcea..9cb89531 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFilesystemValidateFormat(t *testing.T) { @@ -609,7 +609,7 @@ index 7a4d3cdb..c7297db5 100644 "github.com/coreos/go-semver/semver" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -622,7 +622,7 @@ index 6021b915..2d2488ae 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func validateMode(m *int) error { @@ -636,8 +636,8 @@ index addf4afa..87016c22 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/stretchr/testify/assert" ) @@ -651,8 +651,8 @@ index fb41f1f0..f030be40 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -666,8 +666,8 @@ index 265db7f1..5ebd0384 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -681,8 +681,8 @@ index 84be0cd9..567d6930 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -696,8 +696,8 @@ index 728aead6..eb9d34b4 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestValidateLabel(t *testing.T) { @@ -711,8 +711,8 @@ index c06fccf1..5757ac86 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validatePath(p string) error { @@ -725,7 +725,7 @@ index 98960487..13a0e935 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func TestPathValidate(t *testing.T) { @@ -738,7 +738,7 @@ index 9c861fcb..85be6d3f 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -752,8 +752,8 @@ index 34861605..a28bfa70 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -767,8 +767,8 @@ index eac98e74..44b3bf04 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -782,8 +782,8 @@ index 00c5861a..e5c59b6b 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -798,9 +798,9 @@ index e0e5c50a..200931dd 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/shared/validations" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/validations" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/validations" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/go-systemd/v22/unit" cpath "github.com/coreos/vcontext/path" @@ -814,8 +814,8 @@ index b0b2e884..84c04f11 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -829,8 +829,8 @@ index 6a1f9397..90d903f2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validateURL(s string) error { @@ -844,8 +844,8 @@ index 46674d7c..6c9d5908 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestURLValidate(t *testing.T) { @@ -858,7 +858,7 @@ index 23b7d7ad..5dd053b2 100644 "strings" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -871,7 +871,7 @@ index 1ec23b00..0ec09889 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -890,13 +890,13 @@ index a40ae56c..f7c06856 100644 - "github.com/coreos/ignition/v2/config/v3_1/translate" - "github.com/coreos/ignition/v2/config/v3_1/types" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/merge" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ prev "github.com/flatcar-linux/ignition/v2/config/v3_0" -+ "github.com/flatcar-linux/ignition/v2/config/v3_1/translate" -+ "github.com/flatcar-linux/ignition/v2/config/v3_1/types" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/merge" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ++ prev "github.com/flatcar/ignition/v2/config/v3_0" ++ "github.com/flatcar/ignition/v2/config/v3_1/translate" ++ "github.com/flatcar/ignition/v2/config/v3_1/types" ++ "github.com/flatcar/ignition/v2/config/validate" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -910,8 +910,8 @@ index 6c27691b..60782675 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_1/types" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_1/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_1/types" "github.com/stretchr/testify/assert" ) @@ -927,10 +927,10 @@ index 5921c42c..d16abc20 100644 - "github.com/coreos/ignition/v2/config/util" - old_types "github.com/coreos/ignition/v2/config/v3_0/types" - "github.com/coreos/ignition/v2/config/v3_1/types" -+ "github.com/flatcar-linux/ignition/v2/config/translate" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old_types "github.com/flatcar-linux/ignition/v2/config/v3_0/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_1/types" ++ "github.com/flatcar/ignition/v2/config/translate" ++ "github.com/flatcar/ignition/v2/config/util" ++ old_types "github.com/flatcar/ignition/v2/config/v3_0/types" ++ "github.com/flatcar/ignition/v2/config/v3_1/types" ) func translateFilesystem(old old_types.Filesystem) (ret types.Filesystem) { @@ -944,8 +944,8 @@ index 84761a30..9ad5b0ab 100644 - "github.com/coreos/ignition/v2/config/util" - old "github.com/coreos/ignition/v2/config/v3_0/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old "github.com/flatcar-linux/ignition/v2/config/v3_0/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ old "github.com/flatcar/ignition/v2/config/v3_0/types" ) // Check that we have valid translators for the complete config struct @@ -959,8 +959,8 @@ index bbb073ab..3137b652 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -974,8 +974,8 @@ index 97aa84a7..3e077700 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -989,8 +989,8 @@ index f44bf890..3e67741d 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFileValidateOverwrite(t *testing.T) { @@ -1004,8 +1004,8 @@ index 8b07e3b9..0cc4e666 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1019,8 +1019,8 @@ index 94f6b0a2..294dc2ea 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFilesystemValidateFormat(t *testing.T) { @@ -1033,7 +1033,7 @@ index be1aadad..56835594 100644 "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) @@ -1046,7 +1046,7 @@ index 40380b68..02682db1 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func toPointer(val string) *string { @@ -1059,7 +1059,7 @@ index 689b6093..c23e0ed6 100644 "github.com/coreos/go-semver/semver" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1072,7 +1072,7 @@ index 6021b915..2d2488ae 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func validateMode(m *int) error { @@ -1086,8 +1086,8 @@ index addf4afa..87016c22 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/stretchr/testify/assert" ) @@ -1101,8 +1101,8 @@ index fb41f1f0..f030be40 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1116,8 +1116,8 @@ index 265db7f1..5ebd0384 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1131,8 +1131,8 @@ index 84be0cd9..567d6930 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1146,8 +1146,8 @@ index 728aead6..eb9d34b4 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestValidateLabel(t *testing.T) { @@ -1161,8 +1161,8 @@ index c06fccf1..5757ac86 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validatePath(p string) error { @@ -1175,7 +1175,7 @@ index 98960487..13a0e935 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func TestPathValidate(t *testing.T) { @@ -1188,7 +1188,7 @@ index 4a60087f..afe121b0 100644 "net/url" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1202,8 +1202,8 @@ index e9429421..84ee38be 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1216,7 +1216,7 @@ index 9c861fcb..85be6d3f 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1230,8 +1230,8 @@ index 34861605..a28bfa70 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1245,8 +1245,8 @@ index 68da6c7b..8c03b7f5 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1260,8 +1260,8 @@ index eac98e74..44b3bf04 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1275,8 +1275,8 @@ index 00c5861a..e5c59b6b 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1291,9 +1291,9 @@ index e0e5c50a..200931dd 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/shared/validations" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/validations" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/validations" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/go-systemd/v22/unit" cpath "github.com/coreos/vcontext/path" @@ -1307,8 +1307,8 @@ index b0b2e884..84c04f11 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1322,8 +1322,8 @@ index 6a1f9397..90d903f2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validateURL(s string) error { @@ -1337,8 +1337,8 @@ index 46674d7c..6c9d5908 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestURLValidate(t *testing.T) { @@ -1351,7 +1351,7 @@ index e410f98a..d1090f9a 100644 "strings" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1364,7 +1364,7 @@ index 6c0b3b2b..506c2685 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1383,13 +1383,13 @@ index c6c7d94d..3f4ca522 100644 - "github.com/coreos/ignition/v2/config/v3_2/translate" - "github.com/coreos/ignition/v2/config/v3_2/types" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/merge" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ prev "github.com/flatcar-linux/ignition/v2/config/v3_1" -+ "github.com/flatcar-linux/ignition/v2/config/v3_2/translate" -+ "github.com/flatcar-linux/ignition/v2/config/v3_2/types" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/merge" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ++ prev "github.com/flatcar/ignition/v2/config/v3_1" ++ "github.com/flatcar/ignition/v2/config/v3_2/translate" ++ "github.com/flatcar/ignition/v2/config/v3_2/types" ++ "github.com/flatcar/ignition/v2/config/validate" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -1403,8 +1403,8 @@ index 0fb1d221..1f2dc95a 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_2/types" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_2/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_2/types" "github.com/stretchr/testify/assert" ) @@ -1419,9 +1419,9 @@ index 0fd4f420..9066221f 100644 - "github.com/coreos/ignition/v2/config/translate" - old_types "github.com/coreos/ignition/v2/config/v3_1/types" - "github.com/coreos/ignition/v2/config/v3_2/types" -+ "github.com/flatcar-linux/ignition/v2/config/translate" -+ old_types "github.com/flatcar-linux/ignition/v2/config/v3_1/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_2/types" ++ "github.com/flatcar/ignition/v2/config/translate" ++ old_types "github.com/flatcar/ignition/v2/config/v3_1/types" ++ "github.com/flatcar/ignition/v2/config/v3_2/types" ) func translateIgnition(old old_types.Ignition) (ret types.Ignition) { @@ -1435,8 +1435,8 @@ index 72d0b359..a7ca2f85 100644 - "github.com/coreos/ignition/v2/config/util" - old "github.com/coreos/ignition/v2/config/v3_1/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old "github.com/flatcar-linux/ignition/v2/config/v3_1/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ old "github.com/flatcar/ignition/v2/config/v3_1/types" ) // Check that we have valid translators for the complete config struct @@ -1449,7 +1449,7 @@ index 2a1231cb..5191d1e2 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1463,8 +1463,8 @@ index 8caf8499..24c36547 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1478,8 +1478,8 @@ index 4e7566bd..83345a31 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1493,8 +1493,8 @@ index 449e0700..ec53cb38 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFileValidateOverwrite(t *testing.T) { @@ -1508,8 +1508,8 @@ index 3bf064f3..fa68c2d1 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1523,8 +1523,8 @@ index 1f8db903..3cab3146 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFilesystemValidateFormat(t *testing.T) { @@ -1537,7 +1537,7 @@ index be1aadad..56835594 100644 "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) @@ -1550,7 +1550,7 @@ index 40380b68..02682db1 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func toPointer(val string) *string { @@ -1563,7 +1563,7 @@ index 190445bd..746218a6 100644 "github.com/coreos/go-semver/semver" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1577,8 +1577,8 @@ index 123392b2..592d49b8 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1591,7 +1591,7 @@ index ad3e51c2..4ebde9f0 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func validateMode(m *int) error { @@ -1605,8 +1605,8 @@ index 53e37a6b..0dcb80d4 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/stretchr/testify/assert" ) @@ -1620,8 +1620,8 @@ index 248276e7..e23730f2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1635,8 +1635,8 @@ index 20ba4eb6..89a4aa04 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1650,8 +1650,8 @@ index 1b2d97ed..8363be28 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1665,8 +1665,8 @@ index a1e1623f..fde716a9 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestValidateLabel(t *testing.T) { @@ -1680,8 +1680,8 @@ index 131e300c..d6d394a7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validatePath(p string) error { @@ -1694,7 +1694,7 @@ index 3d199cbd..6ed191b6 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func TestPathValidate(t *testing.T) { @@ -1707,7 +1707,7 @@ index d48d210a..088459d8 100644 "net/url" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1721,8 +1721,8 @@ index 269f4fb2..6884dd46 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1735,7 +1735,7 @@ index 5ae4f8c0..22155cd0 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1749,8 +1749,8 @@ index 34861605..a28bfa70 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1764,8 +1764,8 @@ index 68da6c7b..8c03b7f5 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1779,8 +1779,8 @@ index fd1b8cec..9e3e2931 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1794,8 +1794,8 @@ index 7d27bd55..5caf872d 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1809,8 +1809,8 @@ index 86ab79c9..d6df1d98 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1825,9 +1825,9 @@ index bc2d3299..933163a7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/shared/validations" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/validations" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/validations" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/go-systemd/v22/unit" cpath "github.com/coreos/vcontext/path" @@ -1841,8 +1841,8 @@ index 3dc90540..494f210a 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -1856,8 +1856,8 @@ index 0d8771bf..bb90bdf9 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validateURL(s string) error { @@ -1871,8 +1871,8 @@ index bfef261f..c371179f 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestURLValidate(t *testing.T) { @@ -1885,7 +1885,7 @@ index 5def6f04..0aaba72a 100644 "strings" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1898,7 +1898,7 @@ index 9a0914d0..2ec32227 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -1917,13 +1917,13 @@ index 446ea67d..7a4dec23 100644 - "github.com/coreos/ignition/v2/config/v3_3/translate" - "github.com/coreos/ignition/v2/config/v3_3/types" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/merge" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ prev "github.com/flatcar-linux/ignition/v2/config/v3_2" -+ "github.com/flatcar-linux/ignition/v2/config/v3_3/translate" -+ "github.com/flatcar-linux/ignition/v2/config/v3_3/types" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/merge" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ++ prev "github.com/flatcar/ignition/v2/config/v3_2" ++ "github.com/flatcar/ignition/v2/config/v3_3/translate" ++ "github.com/flatcar/ignition/v2/config/v3_3/types" ++ "github.com/flatcar/ignition/v2/config/validate" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -1937,8 +1937,8 @@ index deb1e3b7..4792b544 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_3/types" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_3/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_3/types" "github.com/stretchr/testify/assert" ) @@ -1954,10 +1954,10 @@ index 656ad0a4..970c4db8 100644 - "github.com/coreos/ignition/v2/config/util" - old_types "github.com/coreos/ignition/v2/config/v3_2/types" - "github.com/coreos/ignition/v2/config/v3_3/types" -+ "github.com/flatcar-linux/ignition/v2/config/translate" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old_types "github.com/flatcar-linux/ignition/v2/config/v3_2/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_3/types" ++ "github.com/flatcar/ignition/v2/config/translate" ++ "github.com/flatcar/ignition/v2/config/util" ++ old_types "github.com/flatcar/ignition/v2/config/v3_2/types" ++ "github.com/flatcar/ignition/v2/config/v3_3/types" ) func translateIgnition(old old_types.Ignition) (ret types.Ignition) { @@ -1971,8 +1971,8 @@ index 81f3029b..eccd9029 100644 - "github.com/coreos/ignition/v2/config/util" - old "github.com/coreos/ignition/v2/config/v3_2/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old "github.com/flatcar-linux/ignition/v2/config/v3_2/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ old "github.com/flatcar/ignition/v2/config/v3_2/types" ) // Check that we have valid translators for the complete config struct @@ -1986,8 +1986,8 @@ index 68887d43..6ac55ec6 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2001,8 +2001,8 @@ index f616868c..13f80b6c 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2016,8 +2016,8 @@ index 8caf8499..24c36547 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2031,8 +2031,8 @@ index 4e7566bd..83345a31 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2046,8 +2046,8 @@ index 449e0700..ec53cb38 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFileValidateOverwrite(t *testing.T) { @@ -2061,8 +2061,8 @@ index c722b363..d18da9e3 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2076,8 +2076,8 @@ index 1f8db903..3cab3146 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFilesystemValidateFormat(t *testing.T) { @@ -2090,7 +2090,7 @@ index be1aadad..56835594 100644 "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) @@ -2103,7 +2103,7 @@ index 40380b68..02682db1 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func toPointer(val string) *string { @@ -2116,7 +2116,7 @@ index 190445bd..746218a6 100644 "github.com/coreos/go-semver/semver" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -2129,7 +2129,7 @@ index 1a258727..79eecda7 100644 "testing" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/validate" ) func TestKernelArgumentsValidate(t *testing.T) { @@ -2143,8 +2143,8 @@ index 90d72387..0d505e34 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2157,7 +2157,7 @@ index ad3e51c2..4ebde9f0 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func validateMode(m *int) error { @@ -2171,8 +2171,8 @@ index 53e37a6b..0dcb80d4 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/stretchr/testify/assert" ) @@ -2186,8 +2186,8 @@ index 248276e7..e23730f2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2201,8 +2201,8 @@ index 20ba4eb6..89a4aa04 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2216,8 +2216,8 @@ index 1b2d97ed..8363be28 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2231,8 +2231,8 @@ index a1e1623f..fde716a9 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestValidateLabel(t *testing.T) { @@ -2246,8 +2246,8 @@ index 131e300c..d6d394a7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validatePath(p string) error { @@ -2260,7 +2260,7 @@ index 3d199cbd..6ed191b6 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func TestPathValidate(t *testing.T) { @@ -2273,7 +2273,7 @@ index d48d210a..088459d8 100644 "net/url" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -2287,8 +2287,8 @@ index 269f4fb2..6884dd46 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2302,8 +2302,8 @@ index 9d69aa36..6bc73349 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2317,8 +2317,8 @@ index 7323b26f..542316b2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2332,8 +2332,8 @@ index 68da6c7b..8c03b7f5 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2347,8 +2347,8 @@ index 02108613..7c01d6d1 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2362,8 +2362,8 @@ index cb9256cf..61efae3c 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2377,8 +2377,8 @@ index 86ab79c9..d6df1d98 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2393,9 +2393,9 @@ index bc2d3299..933163a7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/shared/validations" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/validations" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/validations" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/go-systemd/v22/unit" cpath "github.com/coreos/vcontext/path" @@ -2409,8 +2409,8 @@ index 3dc90540..494f210a 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2424,8 +2424,8 @@ index 0d8771bf..bb90bdf9 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validateURL(s string) error { @@ -2439,8 +2439,8 @@ index bfef261f..c371179f 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestURLValidate(t *testing.T) { @@ -2453,7 +2453,7 @@ index 5def6f04..0aaba72a 100644 "strings" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -2466,7 +2466,7 @@ index 9a0914d0..2ec32227 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -2485,13 +2485,13 @@ index a8836488..512fc9f0 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/translate" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/merge" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ prev "github.com/flatcar-linux/ignition/v2/config/v3_3" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/translate" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/merge" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ++ prev "github.com/flatcar/ignition/v2/config/v3_3" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/translate" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/validate" "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" @@ -2505,8 +2505,8 @@ index 97253860..7ff31ee8 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" "github.com/stretchr/testify/assert" ) @@ -2522,10 +2522,10 @@ index 2539c8f4..1076cdba 100644 - "github.com/coreos/ignition/v2/config/util" - old_types "github.com/coreos/ignition/v2/config/v3_3/types" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/translate" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old_types "github.com/flatcar-linux/ignition/v2/config/v3_3/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/translate" ++ "github.com/flatcar/ignition/v2/config/util" ++ old_types "github.com/flatcar/ignition/v2/config/v3_3/types" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) func translateIgnition(old old_types.Ignition) (ret types.Ignition) { @@ -2539,8 +2539,8 @@ index 8ff8c05c..f446bbaf 100644 - "github.com/coreos/ignition/v2/config/util" - old "github.com/coreos/ignition/v2/config/v3_3/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ old "github.com/flatcar-linux/ignition/v2/config/v3_3/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ old "github.com/flatcar/ignition/v2/config/v3_3/types" ) // Check that we have valid translators for the complete config struct @@ -2554,8 +2554,8 @@ index 68887d43..6ac55ec6 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2569,8 +2569,8 @@ index f616868c..13f80b6c 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2584,8 +2584,8 @@ index 8caf8499..24c36547 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2599,8 +2599,8 @@ index 9b71bb26..dafdf5af 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2614,8 +2614,8 @@ index 449e0700..ec53cb38 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFileValidateOverwrite(t *testing.T) { @@ -2629,8 +2629,8 @@ index c722b363..d18da9e3 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2644,8 +2644,8 @@ index 1f8db903..3cab3146 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestFilesystemValidateFormat(t *testing.T) { @@ -2658,7 +2658,7 @@ index be1aadad..56835594 100644 "net/http" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" ) @@ -2671,7 +2671,7 @@ index 40380b68..02682db1 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func toPointer(val string) *string { @@ -2684,7 +2684,7 @@ index 190445bd..746218a6 100644 "github.com/coreos/go-semver/semver" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -2697,7 +2697,7 @@ index 1a258727..79eecda7 100644 "testing" - "github.com/coreos/ignition/v2/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ "github.com/flatcar/ignition/v2/config/validate" ) func TestKernelArgumentsValidate(t *testing.T) { @@ -2711,8 +2711,8 @@ index 90d72387..0d505e34 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2725,7 +2725,7 @@ index 9eb7573d..5e57bb65 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func validateMode(m *int) error { @@ -2739,8 +2739,8 @@ index 8966e25d..be3777d4 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestModeValidate(t *testing.T) { @@ -2754,8 +2754,8 @@ index 248276e7..e23730f2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2769,8 +2769,8 @@ index 20ba4eb6..89a4aa04 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2784,8 +2784,8 @@ index 1b2d97ed..8363be28 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2799,8 +2799,8 @@ index a1e1623f..fde716a9 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestValidateLabel(t *testing.T) { @@ -2814,8 +2814,8 @@ index 131e300c..d6d394a7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validatePath(p string) error { @@ -2828,7 +2828,7 @@ index 3d199cbd..6ed191b6 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ) func TestPathValidate(t *testing.T) { @@ -2841,7 +2841,7 @@ index d48d210a..088459d8 100644 "net/url" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -2855,8 +2855,8 @@ index 269f4fb2..6884dd46 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2870,8 +2870,8 @@ index 9d69aa36..6bc73349 100644 import ( - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2885,8 +2885,8 @@ index 7323b26f..542316b2 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2900,8 +2900,8 @@ index 68da6c7b..8c03b7f5 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2915,8 +2915,8 @@ index 02108613..7c01d6d1 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2930,8 +2930,8 @@ index cb9256cf..61efae3c 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2945,8 +2945,8 @@ index 86ab79c9..d6df1d98 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2961,9 +2961,9 @@ index bc2d3299..933163a7 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/shared/validations" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/validations" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/validations" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/go-systemd/v22/unit" cpath "github.com/coreos/vcontext/path" @@ -2977,8 +2977,8 @@ index 3dc90540..494f210a 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/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" @@ -2992,8 +2992,8 @@ index 3ca189da..f094cde8 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func validateURL(s string) error { @@ -3007,8 +3007,8 @@ index 1901b7af..a0f2268f 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" ) func TestURLValidate(t *testing.T) { @@ -3021,7 +3021,7 @@ index 5def6f04..0aaba72a 100644 "strings" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -3034,7 +3034,7 @@ index 9a0914d0..2ec32227 100644 "testing" - "github.com/coreos/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -3048,8 +3048,8 @@ index 613c21e4..fb02ace8 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/util" "github.com/coreos/vcontext/json" "github.com/coreos/vcontext/path" @@ -3062,7 +3062,7 @@ index 18eea933..2c85ef10 100644 "testing" - ignerrors "github.com/coreos/ignition/v2/config/shared/errors" -+ ignerrors "github.com/flatcar-linux/ignition/v2/config/shared/errors" ++ ignerrors "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" @@ -3072,7 +3072,7 @@ index 06d80e65..e5a47737 100644 +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/ignition/v2 -+module github.com/flatcar-linux/ignition/v2 ++module github.com/flatcar/ignition/v2 go 1.15 @@ -3099,21 +3099,21 @@ index d4ac38ff..049a65d5 100644 - "github.com/coreos/ignition/v2/internal/util" - - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/disks" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/fetch" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/fetch_offline" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/files" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/kargs" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/mount" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/umount" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/internal/exec" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch_offline" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/files" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/kargs" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/mount" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/internal/util" + -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) type Flags struct { @@ -3126,7 +3126,7 @@ index 61ca87ae..0fe37f4a 100644 // Distro-specific settings that can be overridden at link time with e.g. -// -X github.com/coreos/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm -+// -X github.com/flatcar-linux/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm ++// -X github.com/flatcar/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm var ( // Device node directories and paths diskByLabelDir = "/dev/disk/by-label" @@ -3147,15 +3147,15 @@ index 6d1b8cab..54a6aa57 100644 - - latest "github.com/coreos/ignition/v2/config/v3_4_experimental" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/internal/util" + -+ latest "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ latest "github.com/flatcar/ignition/v2/config/v3_4_experimental" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) type ConfigFetcher struct { @@ -3179,18 +3179,18 @@ index efe5dba2..2a9bbba3 100644 - "github.com/coreos/ignition/v2/internal/providers/system" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ latest "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ executil "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/platform" -+ "github.com/flatcar-linux/ignition/v2/internal/providers" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/cmdline" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/system" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ latest "github.com/flatcar/ignition/v2/config/v3_4_experimental" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ executil "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/providers/cmdline" ++ "github.com/flatcar/ignition/v2/internal/providers/system" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" "github.com/coreos/vcontext/report" "github.com/coreos/vcontext/validate" @@ -3210,14 +3210,14 @@ index 745fa19c..285e7e4a 100644 - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/systemd" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/internal/systemd" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/internal/systemd" ) const ( @@ -3233,10 +3233,10 @@ index 0c5eeff1..ef9028bf 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ) var ( @@ -3253,11 +3253,11 @@ index 5fa15e70..dbcd767d 100644 - "github.com/coreos/ignition/v2/internal/distro" - execUtil "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ execUtil "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ execUtil "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/vincent-petithory/dataurl" ) @@ -3273,10 +3273,10 @@ index 54730b41..99189da0 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/sgdisk" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/sgdisk" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/sgdisk" ) var ( @@ -3291,9 +3291,9 @@ index f838f349..dff93413 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ) func (s stage) createRaids(config types.Config) error { @@ -3311,12 +3311,12 @@ index f163509e..7b36e267 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ) const ( @@ -3336,14 +3336,14 @@ index dcea43a8..5213099a 100644 - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/util" -+ cfgutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ executil "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/internal/util" ++ cfgutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ executil "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/internal/util" ) const ( @@ -3357,8 +3357,8 @@ index 11f133ff..259f0d69 100644 - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" "github.com/stretchr/testify/assert" ) @@ -3377,13 +3377,13 @@ index 7d97df5f..de976b5d 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ) const ( @@ -3397,8 +3397,8 @@ index 9428b883..f0cf4ef0 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ) func TestEntrySort(t *testing.T) { @@ -3415,11 +3415,11 @@ index c61824ba..d7af2c85 100644 - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/log" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" "github.com/vincent-petithory/dataurl" ) @@ -3428,7 +3428,7 @@ index c61824ba..d7af2c85 100644 // Append all the hard links to the list after sorting. This allows // Ignition to create hard links to files that are deeper than the hard - // link. For reference: https://github.com/coreos/ignition/issues/800 -+ // link. For reference: https://github.com/flatcar-linux/ignition/issues/800 ++ // link. For reference: https://github.com/flatcar/ignition/issues/800 entries = append(entries, hardlinks...) return entries, nil @@ -3442,8 +3442,8 @@ index 2c5e2d9d..638975a8 100644 - "github.com/coreos/ignition/v2/config/util" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) func (s *stage) expandGlobList(globs ...string) ([]string, error) { @@ -3460,11 +3460,11 @@ index f7ded9e8..fdc7be59 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/internal/systemd" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/systemd" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/systemd" ) // Preset holds the information about @@ -3473,7 +3473,7 @@ index f7ded9e8..fdc7be59 100644 } if systemdVersion < 240 { - s.Logger.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/coreos/ignition/issues/586 for more information.", systemdVersion) -+ s.Logger.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/flatcar-linux/ignition/issues/586 for more information.", systemdVersion) ++ s.Logger.Warning("The version of systemd (%q) is less than 240. Enabling/disabling instantiated units may not work. See https://github.com/flatcar/ignition/issues/586 for more information.", systemdVersion) } return nil } @@ -3487,8 +3487,8 @@ index b7020f7e..a9ead954 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) func TestParseInstanceUnit(t *testing.T) { @@ -3507,13 +3507,13 @@ index 7267709f..2b7b19e4 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ) const ( @@ -3533,14 +3533,14 @@ index 1c25dfed..8ec9ca99 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ) const ( @@ -3557,11 +3557,11 @@ index dc4d7d3e..b7be351e 100644 - "github.com/coreos/ignition/v2/internal/registry" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/registry" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/registry" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ) // Stage is responsible for actually executing a stage of the configuration. @@ -3580,13 +3580,13 @@ index d7b7fbba..1abcb57c 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" "golang.org/x/sys/unix" ) @@ -3599,7 +3599,7 @@ index 92db9026..a9fc6b64 100644 "unsafe" - "github.com/coreos/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/util" ) const ( @@ -3616,11 +3616,11 @@ index d5a680d4..de46f9d6 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/util" -+ cutil "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/util" ++ cutil "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/util" "golang.org/x/sys/unix" ) @@ -3636,10 +3636,10 @@ index e6050d04..713dacb9 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/as_user" - "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/as_user" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/as_user" ++ "github.com/flatcar/ignition/v2/internal/distro" "golang.org/x/sys/unix" ) @@ -3652,7 +3652,7 @@ index a274eae6..25eb17f1 100644 "strings" - "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/distro" ) const ( @@ -3666,8 +3666,8 @@ index d42c51ad..20afc279 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" "github.com/vincent-petithory/dataurl" ) @@ -3680,7 +3680,7 @@ index c30e1550..fd0901df 100644 "testing" - "github.com/coreos/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/log" ) // tempBase() slaps together a minimal /etc/{passwd,group} for the lookup test. @@ -3695,9 +3695,9 @@ index 4a81f776..ebe7e00c 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" - "github.com/coreos/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/state" ) // Util encapsulates logging and destdir indirection for the util methods. @@ -3724,21 +3724,21 @@ index 809a92b5..b87c6293 100644 - "github.com/coreos/ignition/v2/internal/platform" - "github.com/coreos/ignition/v2/internal/state" - "github.com/coreos/ignition/v2/internal/version" -+ "github.com/flatcar-linux/ignition/v2/config" -+ "github.com/flatcar-linux/ignition/v2/internal/apply" -+ "github.com/flatcar-linux/ignition/v2/internal/exec" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/stages" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/disks" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/fetch" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/fetch_offline" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/files" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/kargs" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/mount" -+ _ "github.com/flatcar-linux/ignition/v2/internal/exec/stages/umount" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/platform" -+ "github.com/flatcar-linux/ignition/v2/internal/state" -+ "github.com/flatcar-linux/ignition/v2/internal/version" ++ "github.com/flatcar/ignition/v2/config" ++ "github.com/flatcar/ignition/v2/internal/apply" ++ "github.com/flatcar/ignition/v2/internal/exec" ++ "github.com/flatcar/ignition/v2/internal/exec/stages" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/disks" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/fetch_offline" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/files" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/kargs" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/mount" ++ _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/state" ++ "github.com/flatcar/ignition/v2/internal/version" "github.com/spf13/pflag" ) @@ -3775,31 +3775,31 @@ index 23339439..f7c59b7f 100644 - "github.com/coreos/ignition/v2/internal/providers/zvm" - "github.com/coreos/ignition/v2/internal/registry" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/aliyun" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/aws" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/azure" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/azurestack" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/cloudstack" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/digitalocean" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/exoscale" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/file" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/gcp" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/ibmcloud" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/kubevirt" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/noop" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/nutanix" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/openstack" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/packet" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/powervs" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/qemu" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/virtualbox" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/vmware" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/vultr" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/zvm" -+ "github.com/flatcar-linux/ignition/v2/internal/registry" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/providers/aliyun" ++ "github.com/flatcar/ignition/v2/internal/providers/aws" ++ "github.com/flatcar/ignition/v2/internal/providers/azure" ++ "github.com/flatcar/ignition/v2/internal/providers/azurestack" ++ "github.com/flatcar/ignition/v2/internal/providers/cloudstack" ++ "github.com/flatcar/ignition/v2/internal/providers/digitalocean" ++ "github.com/flatcar/ignition/v2/internal/providers/exoscale" ++ "github.com/flatcar/ignition/v2/internal/providers/file" ++ "github.com/flatcar/ignition/v2/internal/providers/gcp" ++ "github.com/flatcar/ignition/v2/internal/providers/ibmcloud" ++ "github.com/flatcar/ignition/v2/internal/providers/kubevirt" ++ "github.com/flatcar/ignition/v2/internal/providers/noop" ++ "github.com/flatcar/ignition/v2/internal/providers/nutanix" ++ "github.com/flatcar/ignition/v2/internal/providers/openstack" ++ "github.com/flatcar/ignition/v2/internal/providers/packet" ++ "github.com/flatcar/ignition/v2/internal/providers/powervs" ++ "github.com/flatcar/ignition/v2/internal/providers/qemu" ++ "github.com/flatcar/ignition/v2/internal/providers/virtualbox" ++ "github.com/flatcar/ignition/v2/internal/providers/vmware" ++ "github.com/flatcar/ignition/v2/internal/providers/vultr" ++ "github.com/flatcar/ignition/v2/internal/providers/zvm" ++ "github.com/flatcar/ignition/v2/internal/registry" ++ "github.com/flatcar/ignition/v2/internal/resource" ) var ( @@ -3814,9 +3814,9 @@ index 2da29f86..145a6cee 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -3832,10 +3832,10 @@ index b2385ac8..28157e60 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds" @@ -3844,7 +3844,7 @@ index b2385ac8..28157e60 100644 // network takes a while to come up. // - // https://github.com/coreos/ignition/issues/1158 -+ // https://github.com/flatcar-linux/ignition/issues/1158 ++ // https://github.com/flatcar/ignition/issues/1158 // // TODO: investigate alternative solutions (adding a Retryer to the // aws.Config, fetching the region from an HTTP URL, handle the @@ -3862,12 +3862,12 @@ index 7948e7fe..2f3374c0 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ execUtil "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ execUtil "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" "golang.org/x/sys/unix" @@ -3882,9 +3882,9 @@ index 10da8d23..4d815569 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/azure" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/azure" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/azure" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -3902,12 +3902,12 @@ index 4e94faef..1a0aa048 100644 - "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-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "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" ) @@ -3916,7 +3916,7 @@ index 4e94faef..1a0aa048 100644 // The fetch-offline approach doesn't work well here because of the "split // personality" of this provider. See: - // https://github.com/coreos/ignition/issues/1081 -+ // https://github.com/flatcar-linux/ignition/issues/1081 ++ // https://github.com/flatcar/ignition/issues/1081 if f.Offline { return types.Config{}, report.Report{}, resource.ErrNeedNet } @@ -3934,12 +3934,12 @@ index 37d246c7..0068ed66 100644 - "github.com/coreos/ignition/v2/internal/providers" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -3954,9 +3954,9 @@ index 928bd272..c6724db8 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -3971,9 +3971,9 @@ index 265e904d..08378c14 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -3988,9 +3988,9 @@ index 794df19a..6def37e7 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4005,9 +4005,9 @@ index 5fbdd648..b3ac9da2 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4025,12 +4025,12 @@ index 83bb8952..787ef659 100644 - "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-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "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" ) @@ -4048,12 +4048,12 @@ index ca7ef67b..a3132bfe 100644 - "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-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "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" ) @@ -4068,9 +4068,9 @@ index cfc20174..2b9e583d 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4088,12 +4088,12 @@ index c46beab4..7864d33a 100644 - "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-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "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" ) @@ -4111,12 +4111,12 @@ index 832cbf08..b8439cd4 100644 - "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-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "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" ) @@ -4125,7 +4125,7 @@ index 832cbf08..b8439cd4 100644 // The fetch-offline approach doesn't work well here because of the "split // personality" of this provider. See: - // https://github.com/coreos/ignition/issues/1081 -+ // https://github.com/flatcar-linux/ignition/issues/1081 ++ // https://github.com/flatcar/ignition/issues/1081 if f.Offline { return types.Config{}, report.Report{}, resource.ErrNeedNet } @@ -4140,9 +4140,9 @@ index 29b6c161..ce91a131 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4160,12 +4160,12 @@ index fe41ec95..578b6d38 100644 - "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-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "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" ) @@ -4180,9 +4180,9 @@ index daa80bfb..0bcbd712 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4198,10 +4198,10 @@ index ba05ff6d..ffd2eec0 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4216,9 +4216,9 @@ index 65c76875..a4ebec6a 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4237,13 +4237,13 @@ index 36cc2b9f..4ec5cf98 100644 - "github.com/coreos/ignition/v2/internal/providers" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ latest "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ latest "github.com/flatcar/ignition/v2/config/v3_4_experimental" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4258,9 +4258,9 @@ index 59e4f9b8..c767f5e5 100644 - "github.com/coreos/ignition/v2/config" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/config" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/config" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/log" "github.com/coreos/vcontext/report" ) @@ -4276,10 +4276,10 @@ index e37304c0..dde19316 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4295,10 +4295,10 @@ index 186ec97d..66ff5490 100644 - "github.com/coreos/ignition/v2/internal/providers" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" "github.com/vmware/vmw-guestinfo/rpcvmx" @@ -4312,8 +4312,8 @@ index e9e26cca..bf0e346f 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4328,9 +4328,9 @@ index e691d20b..9bb01c30 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4348,12 +4348,12 @@ index d8a743c6..25affe3e 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/providers/util" - "github.com/coreos/ignition/v2/internal/resource" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/providers/util" -+ "github.com/flatcar-linux/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" ) @@ -4371,12 +4371,12 @@ index 471349a1..9f1d3667 100644 - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/util" - "github.com/coreos/ignition/v2/internal/version" -+ ignerrors "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/earlyrand" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/util" -+ "github.com/flatcar-linux/ignition/v2/internal/version" ++ ignerrors "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/earlyrand" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/internal/version" "github.com/vincent-petithory/dataurl" @@ -4391,9 +4391,9 @@ index 2696b697..25993094 100644 - configErrors "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/util" -+ configErrors "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/util" ++ configErrors "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/util" "golang.org/x/oauth2/google" "google.golang.org/api/option" @@ -4408,9 +4408,9 @@ index 77a39c93..e4241c4f 100644 - "github.com/coreos/ignition/v2/config/shared/errors" - "github.com/coreos/ignition/v2/internal/log" - "github.com/coreos/ignition/v2/internal/util" -+ "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/util" ) func TestDataUrl(t *testing.T) { @@ -4426,10 +4426,10 @@ index 3445e2a9..27dfe3ea 100644 - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/internal/distro" - "github.com/coreos/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/config/util" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" -+ "github.com/flatcar-linux/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/config/util" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/distro" ++ "github.com/flatcar/ignition/v2/internal/log" ) type Operation struct { @@ -4442,7 +4442,7 @@ index a5dd8abf..555244d0 100644 "strings" - "github.com/coreos/ignition/v2/config" -+ "github.com/flatcar-linux/ignition/v2/config" ++ "github.com/flatcar/ignition/v2/config" ) // Specific section marker used in the docs to indicate that the Markdown code @@ -4455,7 +4455,7 @@ index 26e3f9cc..b2d3414f 100644 "strings" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) var ( @@ -4468,7 +4468,7 @@ index fd9132c0..b92ad5ae 100644 "testing" - "github.com/coreos/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ) func TestAssertValid(t *testing.T) { @@ -4484,14 +4484,14 @@ index b7c240fe..5b586619 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/servers" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/config" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/servers" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/config" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/servers" ++ "github.com/flatcar/ignition/v2/tests/types" // Register the tests - _ "github.com/coreos/ignition/v2/tests/registry" -+ _ "github.com/flatcar-linux/ignition/v2/tests/registry" ++ _ "github.com/flatcar/ignition/v2/tests/registry" // UUID generation tool "github.com/google/uuid" @@ -4505,8 +4505,8 @@ index fa16c44b..25ed3d7b 100644 - ut "github.com/coreos/ignition/v2/internal/util" - "github.com/coreos/ignition/v2/tests/types" -+ ut "github.com/flatcar-linux/ignition/v2/internal/util" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ ut "github.com/flatcar/ignition/v2/internal/util" ++ "github.com/flatcar/ignition/v2/tests/types" ) func run(ctx context.Context, command string, args ...string) ([]byte, error) { @@ -4520,8 +4520,8 @@ index e4bab782..f0634563 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4535,8 +4535,8 @@ index a4cf1d66..dc681fbd 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4550,8 +4550,8 @@ index 3abfb574..613adb82 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4565,8 +4565,8 @@ index 6a80fae6..9995ae94 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4580,8 +4580,8 @@ index db132cac..fce7eb73 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4595,8 +4595,8 @@ index 7665a82b..ffb50fb5 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4610,8 +4610,8 @@ index 2166e532..4d94ba47 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4625,8 +4625,8 @@ index e62ee681..ecf64fc1 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4640,8 +4640,8 @@ index 3116e331..e5302154 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" "github.com/vincent-petithory/dataurl" ) @@ -4655,8 +4655,8 @@ index ae6f50f5..27e3a25d 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4670,8 +4670,8 @@ index f9d258c0..3501231e 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4685,8 +4685,8 @@ index 7492f940..4e51bb17 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) var ( @@ -4700,8 +4700,8 @@ index 0627c635..5d388afc 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4716,9 +4716,9 @@ index 0df69e7b..63bde529 100644 - "github.com/coreos/ignition/v2/tests/fixtures" - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/fixtures" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/fixtures" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4732,8 +4732,8 @@ index 5ac0967b..d72ba402 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4747,8 +4747,8 @@ index 5bda64c1..ac612b91 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4762,8 +4762,8 @@ index 0dd092e1..a3c69464 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4778,9 +4778,9 @@ index 8faecff7..13f5c56d 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/servers" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/servers" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/servers" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4794,8 +4794,8 @@ index 72dd1b1f..503ffaac 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4804,7 +4804,7 @@ index 72dd1b1f..503ffaac 100644 // CreateDeepHardLinkToFile checks if Ignition can create a hard // link to a file that's deeper than the hard link. For more -// information: https://github.com/coreos/ignition/issues/800 -+// information: https://github.com/flatcar-linux/ignition/issues/800 ++// information: https://github.com/flatcar/ignition/issues/800 func CreateDeepHardLinkToFile() types.Test { name := "links.hard.deep.create.file" in := types.GetBaseDisk() @@ -4819,9 +4819,9 @@ index d1a8244e..3c9ee830 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/servers" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/servers" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/servers" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4835,8 +4835,8 @@ index b8974479..d67861d9 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4850,8 +4850,8 @@ index b0f058ee..33bb7f28 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4865,8 +4865,8 @@ index daa72d7d..a16f933a 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4881,9 +4881,9 @@ index 6e58db70..db17df33 100644 - "github.com/coreos/ignition/v2/tests/fixtures" - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/fixtures" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/fixtures" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4898,9 +4898,9 @@ index bb83da30..6dae147d 100644 - "github.com/coreos/ignition/v2/tests/fixtures" - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/fixtures" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/fixtures" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4914,8 +4914,8 @@ index be667be2..26d34d2c 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4930,9 +4930,9 @@ index ff7722f7..987f85dd 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/servers" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/servers" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/servers" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4946,8 +4946,8 @@ index 5952097f..af50f634 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4961,8 +4961,8 @@ index 5c090e80..7ec877f1 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4976,8 +4976,8 @@ index 696108a1..337ba883 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -4991,8 +4991,8 @@ index 4e32d3cd..31fa5783 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5006,8 +5006,8 @@ index 31402918..2e01e6cc 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5021,8 +5021,8 @@ index 58c6bbb0..c6b1dafb 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5036,8 +5036,8 @@ index 1488e499..5e6065c0 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5051,8 +5051,8 @@ index 10d32990..a4ae7516 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5066,8 +5066,8 @@ index b199cae6..a3ba770f 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5081,8 +5081,8 @@ index 1863c744..cdfa6c10 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) var ( @@ -5096,8 +5096,8 @@ index 329d14bd..9228ef59 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5113,10 +5113,10 @@ index 0b52d784..c89c5730 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/servers" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/fixtures" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/servers" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/fixtures" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/servers" ++ "github.com/flatcar/ignition/v2/tests/types" "github.com/vincent-petithory/dataurl" ) @@ -5130,8 +5130,8 @@ index 1964a602..6ad13093 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5145,8 +5145,8 @@ index a3faf958..d3382143 100644 import ( - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5160,8 +5160,8 @@ index 34408293..70e4c639 100644 - "github.com/coreos/ignition/v2/tests/register" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/tests/register" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/tests/register" ++ "github.com/flatcar/ignition/v2/tests/types" ) func init() { @@ -5179,12 +5179,12 @@ index c6ae2d64..5d5919da 100644 - types33 "github.com/coreos/ignition/v2/config/v3_3/types" - types_exp "github.com/coreos/ignition/v2/config/v3_4_experimental/types" - "github.com/coreos/ignition/v2/tests/types" -+ types30 "github.com/flatcar-linux/ignition/v2/config/v3_0/types" -+ types31 "github.com/flatcar-linux/ignition/v2/config/v3_1/types" -+ types32 "github.com/flatcar-linux/ignition/v2/config/v3_2/types" -+ types33 "github.com/flatcar-linux/ignition/v2/config/v3_3/types" -+ types_exp "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ types30 "github.com/flatcar/ignition/v2/config/v3_0/types" ++ types31 "github.com/flatcar/ignition/v2/config/v3_1/types" ++ types32 "github.com/flatcar/ignition/v2/config/v3_2/types" ++ types33 "github.com/flatcar/ignition/v2/config/v3_3/types" ++ types_exp "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" ++ "github.com/flatcar/ignition/v2/tests/types" ) type TestType int @@ -5214,24 +5214,24 @@ index 917106b1..d1609676 100644 - _ "github.com/coreos/ignition/v2/tests/positive/security" - _ "github.com/coreos/ignition/v2/tests/positive/systemd" - _ "github.com/coreos/ignition/v2/tests/positive/timeouts" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/files" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/filesystems" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/general" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/partitions" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/proxy" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/regression" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/security" -+ _ "github.com/flatcar-linux/ignition/v2/tests/negative/timeouts" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/files" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/filesystems" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/general" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/partitions" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/passwd" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/proxy" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/regression" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/security" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/systemd" -+ _ "github.com/flatcar-linux/ignition/v2/tests/positive/timeouts" ++ _ "github.com/flatcar/ignition/v2/tests/negative/files" ++ _ "github.com/flatcar/ignition/v2/tests/negative/filesystems" ++ _ "github.com/flatcar/ignition/v2/tests/negative/general" ++ _ "github.com/flatcar/ignition/v2/tests/negative/partitions" ++ _ "github.com/flatcar/ignition/v2/tests/negative/proxy" ++ _ "github.com/flatcar/ignition/v2/tests/negative/regression" ++ _ "github.com/flatcar/ignition/v2/tests/negative/security" ++ _ "github.com/flatcar/ignition/v2/tests/negative/timeouts" ++ _ "github.com/flatcar/ignition/v2/tests/positive/files" ++ _ "github.com/flatcar/ignition/v2/tests/positive/filesystems" ++ _ "github.com/flatcar/ignition/v2/tests/positive/general" ++ _ "github.com/flatcar/ignition/v2/tests/positive/partitions" ++ _ "github.com/flatcar/ignition/v2/tests/positive/passwd" ++ _ "github.com/flatcar/ignition/v2/tests/positive/proxy" ++ _ "github.com/flatcar/ignition/v2/tests/positive/regression" ++ _ "github.com/flatcar/ignition/v2/tests/positive/security" ++ _ "github.com/flatcar/ignition/v2/tests/positive/systemd" ++ _ "github.com/flatcar/ignition/v2/tests/positive/timeouts" ) diff --git a/tests/servers/servers.go b/tests/servers/servers.go index 4082c2e4..e07d6d8f 100644 @@ -5242,7 +5242,7 @@ index 4082c2e4..e07d6d8f 100644 "time" - "github.com/coreos/ignition/v2/tests/fixtures" -+ "github.com/flatcar-linux/ignition/v2/tests/fixtures" ++ "github.com/flatcar/ignition/v2/tests/fixtures" "github.com/pin/tftp" ) @@ -5256,8 +5256,8 @@ index 6256ace8..c1bc8d62 100644 - "github.com/coreos/ignition/v2/internal/exec/util" - "github.com/coreos/ignition/v2/tests/types" -+ "github.com/flatcar-linux/ignition/v2/internal/exec/util" -+ "github.com/flatcar-linux/ignition/v2/tests/types" ++ "github.com/flatcar/ignition/v2/internal/exec/util" ++ "github.com/flatcar/ignition/v2/tests/types" "golang.org/x/sys/unix" ) @@ -5271,8 +5271,8 @@ index 3ac03d7c..5edf143e 100644 - "github.com/coreos/ignition/v2/config" - "github.com/coreos/ignition/v2/internal/version" -+ "github.com/flatcar-linux/ignition/v2/config" -+ "github.com/flatcar-linux/ignition/v2/internal/version" ++ "github.com/flatcar/ignition/v2/config" ++ "github.com/flatcar/ignition/v2/internal/version" ) var ( diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch index 40c9753b88..5bc066bd60 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-ign-converter-dependency.patch @@ -16,8 +16,8 @@ index e5a47737..9b5da9f3 100644 github.com/coreos/go-semver v0.3.0 github.com/coreos/go-systemd/v22 v22.0.0 github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 -+ github.com/flatcar-linux/ign-converter v0.2.0 -+ github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba ++ github.com/flatcar/ign-converter v0.2.0 ++ github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba github.com/google/renameio v0.1.0 github.com/google/uuid v1.1.1 github.com/pin/tftp v2.1.0+incompatible diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch index b85fec5407..f4e2080013 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch @@ -44,11 +44,11 @@ index 097b98c7..afe8e529 100644 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -+github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8= -+github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= -+github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= -+github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= -+github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= ++github.com/flatcar/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8= ++github.com/flatcar/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= ++github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= ++github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= ++github.com/flatcar/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch index 90abc6692d..2872aed103 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-vendor-go-mod-vendor.patch @@ -20,11 +20,11 @@ Signed-off-by: Mathieu Tortuyaux .../coreos/go-systemd/unit/escape.go | 116 + .../coreos/go-systemd/unit/option.go | 59 + .../coreos/go-systemd/unit/serialize.go | 75 + - .../flatcar-linux/ign-converter/LICENSE | 202 + + .../flatcar/ign-converter/LICENSE | 202 + .../translate/v24tov31/v24tov31.go | 688 ++ - .../flatcar-linux/ign-converter/util/util.go | 166 + - .../github.com/flatcar-linux/ignition/LICENSE | 202 + - .../github.com/flatcar-linux/ignition/NOTICE | 5 + + .../flatcar/ign-converter/util/util.go | 166 + + .../github.com/flatcar/ignition/LICENSE | 202 + + .../github.com/flatcar/ignition/NOTICE | 5 + .../ignition/config/shared/errors/errors.go | 109 + .../config/shared/validations/unit.go | 54 + .../ignition/config/util/helpers.go | 34 + @@ -190,142 +190,142 @@ Signed-off-by: Mathieu Tortuyaux create mode 100644 vendor/github.com/coreos/go-systemd/unit/escape.go create mode 100644 vendor/github.com/coreos/go-systemd/unit/option.go create mode 100644 vendor/github.com/coreos/go-systemd/unit/serialize.go - create mode 100644 vendor/github.com/flatcar-linux/ign-converter/LICENSE - create mode 100644 vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go - create mode 100644 vendor/github.com/flatcar-linux/ign-converter/util/util.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/LICENSE - create mode 100644 vendor/github.com/flatcar-linux/ignition/NOTICE - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/util/helpers.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/util/parsingErrors.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/cloudinit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/disk.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/file.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/filesystem.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/group.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/networkd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/partition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/passwd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/path.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/raid.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/storage.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/systemd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v1/types/user.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/append.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/cloudinit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/translate.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/compression.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/disk.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/file.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/filesystem.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/group.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/hash.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/ignition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/networkd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/partition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/passwd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/path.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/raid.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/storage.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/systemd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/url.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/user.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_0/types/verification.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/append.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/cloudinit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/translate.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/directory.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/disk.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/file.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/filesystem.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/ignition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/mode.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/node.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/partition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/passwd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/path.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/raid.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/schema.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/url.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_1/types/verification.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/append.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/cloudinit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/translate.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ca.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/directory.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/disk.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/file.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/filesystem.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ignition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/mode.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/node.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/partition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/passwd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/path.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/raid.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/schema.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/url.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_2/types/verification.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/append.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/cloudinit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/translate.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/schema.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/append.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/cloudinit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/translate.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ca.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/config.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/directory.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/disk.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/file.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/filesystem.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/headers.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ignition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/mode.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/node.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/partition.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/passwd.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/path.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/raid.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/schema.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/unit.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/url.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/v2_4/types/verification.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/validate/astnode/astnode.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/validate/report/report.go - create mode 100644 vendor/github.com/flatcar-linux/ignition/config/validate/validate.go + create mode 100644 vendor/github.com/flatcar/ign-converter/LICENSE + create mode 100644 vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go + create mode 100644 vendor/github.com/flatcar/ign-converter/util/util.go + create mode 100644 vendor/github.com/flatcar/ignition/LICENSE + create mode 100644 vendor/github.com/flatcar/ignition/NOTICE + create mode 100644 vendor/github.com/flatcar/ignition/config/shared/errors/errors.go + create mode 100644 vendor/github.com/flatcar/ignition/config/shared/validations/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/util/helpers.go + create mode 100644 vendor/github.com/flatcar/ignition/config/util/parsingErrors.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/cloudinit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/disk.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/file.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/filesystem.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/group.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/networkd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/partition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/passwd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/path.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/raid.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/storage.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/systemd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v1/types/user.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/append.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/cloudinit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/translate.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/compression.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/disk.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/file.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/filesystem.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/group.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/hash.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/ignition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/networkd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/partition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/passwd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/path.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/raid.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/storage.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/systemd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/url.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/user.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_0/types/verification.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/append.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/cloudinit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/translate.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/directory.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/disk.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/file.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/filesystem.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/ignition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/mode.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/node.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/partition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/passwd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/path.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/raid.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/schema.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/url.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_1/types/verification.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/append.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/cloudinit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/translate.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/ca.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/directory.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/disk.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/file.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/filesystem.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/ignition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/mode.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/node.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/partition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/passwd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/path.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/raid.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/schema.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/url.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_2/types/verification.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/append.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/cloudinit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/translate.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/file.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/node.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/path.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/schema.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/url.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/append.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/cloudinit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/translate.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/ca.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/config.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/directory.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/disk.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/file.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/filesystem.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/headers.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/ignition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/mode.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/node.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/partition.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/passwd.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/path.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/raid.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/schema.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/unit.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/url.go + create mode 100644 vendor/github.com/flatcar/ignition/config/v2_4/types/verification.go + create mode 100644 vendor/github.com/flatcar/ignition/config/validate/astjson/node.go + create mode 100644 vendor/github.com/flatcar/ignition/config/validate/astnode/astnode.go + create mode 100644 vendor/github.com/flatcar/ignition/config/validate/report/report.go + create mode 100644 vendor/github.com/flatcar/ignition/config/validate/validate.go create mode 100644 vendor/go4.org/AUTHORS create mode 100644 vendor/go4.org/LICENSE create mode 100644 vendor/go4.org/errorutil/highlight.go @@ -5029,11 +5029,11 @@ index 00000000..e07799ca + buf.WriteRune('=') + buf.WriteString(opt.Value) +} -diff --git a/vendor/github.com/flatcar-linux/ign-converter/LICENSE b/vendor/github.com/flatcar-linux/ign-converter/LICENSE +diff --git a/vendor/github.com/flatcar/ign-converter/LICENSE b/vendor/github.com/flatcar/ign-converter/LICENSE new file mode 100644 index 00000000..e06d2081 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ign-converter/LICENSE ++++ b/vendor/github.com/flatcar/ign-converter/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 @@ -5237,11 +5237,11 @@ index 00000000..e06d2081 + See the License for the specific language governing permissions and + limitations under the License. + -diff --git a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go +diff --git a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go new file mode 100644 index 00000000..d10cd7c3 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go ++++ b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go @@ -0,0 +1,688 @@ +// Copyright 2020 Red Hat, Inc. +// @@ -5267,12 +5267,12 @@ index 00000000..d10cd7c3 + "path/filepath" + "reflect" + -+ old "github.com/flatcar-linux/ignition/config/v2_4/types" -+ oldValidate "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/v2/config/v3_1/types" -+ "github.com/flatcar-linux/ignition/v2/config/validate" ++ old "github.com/flatcar/ignition/config/v2_4/types" ++ oldValidate "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/v2/config/v3_1/types" ++ "github.com/flatcar/ignition/v2/config/validate" + -+ "github.com/flatcar-linux/ign-converter/util" ++ "github.com/flatcar/ign-converter/util" +) + +// Check2_4 returns if the config is translatable but does not do any translation. @@ -5568,7 +5568,7 @@ index 00000000..d10cd7c3 + // It does so following the apparent intent of the upstream code [1] + // which actually does the opposite for Enable=true Enabled=false + // because the first matching line in a systemd preset wins. -+ // [1] https://github.com/flatcar-linux/ignition/blob/b4d18ad3fcb278a890327f858c1c10256ab6ee9d/internal/exec/stages/files/units.go#L32 ++ // [1] https://github.com/flatcar/ignition/blob/b4d18ad3fcb278a890327f858c1c10256ab6ee9d/internal/exec/stages/files/units.go#L32 + if (u.Enabled != nil && *u.Enabled) || u.Enable { + enabled = util.BoolP(true) + } @@ -5931,11 +5931,11 @@ index 00000000..d10cd7c3 + + return cfg, nil +} -diff --git a/vendor/github.com/flatcar-linux/ign-converter/util/util.go b/vendor/github.com/flatcar-linux/ign-converter/util/util.go +diff --git a/vendor/github.com/flatcar/ign-converter/util/util.go b/vendor/github.com/flatcar/ign-converter/util/util.go new file mode 100644 index 00000000..347d148c --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ign-converter/util/util.go ++++ b/vendor/github.com/flatcar/ign-converter/util/util.go @@ -0,0 +1,166 @@ +// Copyright 2020 Red Hat, Inc. +// @@ -6103,11 +6103,11 @@ index 00000000..347d148c + counterMutex.Unlock() + return name, nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/LICENSE b/vendor/github.com/flatcar-linux/ignition/LICENSE +diff --git a/vendor/github.com/flatcar/ignition/LICENSE b/vendor/github.com/flatcar/ignition/LICENSE new file mode 100644 index 00000000..e06d2081 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/LICENSE ++++ b/vendor/github.com/flatcar/ignition/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 @@ -6311,22 +6311,22 @@ index 00000000..e06d2081 + See the License for the specific language governing permissions and + limitations under the License. + -diff --git a/vendor/github.com/flatcar-linux/ignition/NOTICE b/vendor/github.com/flatcar-linux/ignition/NOTICE +diff --git a/vendor/github.com/flatcar/ignition/NOTICE b/vendor/github.com/flatcar/ignition/NOTICE new file mode 100644 index 00000000..e520005c --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/NOTICE ++++ b/vendor/github.com/flatcar/ignition/NOTICE @@ -0,0 +1,5 @@ +CoreOS Project +Copyright 2015 CoreOS, Inc + +This product includes software developed at CoreOS, Inc. +(http://www.coreos.com/). -diff --git a/vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go b/vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go +diff --git a/vendor/github.com/flatcar/ignition/config/shared/errors/errors.go b/vendor/github.com/flatcar/ignition/config/shared/errors/errors.go new file mode 100644 index 00000000..f2b47cf9 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/shared/errors/errors.go ++++ b/vendor/github.com/flatcar/ignition/config/shared/errors/errors.go @@ -0,0 +1,109 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -6437,11 +6437,11 @@ index 00000000..f2b47cf9 +func NewNoInstallSectionError(name string) error { + return fmt.Errorf("unit %q is enabled, but has no install section so enable does nothing", name) +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go b/vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/shared/validations/unit.go b/vendor/github.com/flatcar/ignition/config/shared/validations/unit.go new file mode 100644 index 00000000..383a2c6b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/shared/validations/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/shared/validations/unit.go @@ -0,0 +1,54 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -6463,8 +6463,8 @@ index 00000000..383a2c6b + +import ( + "github.com/coreos/go-systemd/unit" -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +// ValidateInstallSection is a helper to validate a given unit @@ -6497,11 +6497,11 @@ index 00000000..383a2c6b + }}, + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/util/helpers.go b/vendor/github.com/flatcar-linux/ignition/config/util/helpers.go +diff --git a/vendor/github.com/flatcar/ignition/config/util/helpers.go b/vendor/github.com/flatcar/ignition/config/util/helpers.go new file mode 100644 index 00000000..7d55548f --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/util/helpers.go ++++ b/vendor/github.com/flatcar/ignition/config/util/helpers.go @@ -0,0 +1,34 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -6537,11 +6537,11 @@ index 00000000..7d55548f +func BoolToPtr(b bool) *bool { + return &b +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/util/parsingErrors.go b/vendor/github.com/flatcar-linux/ignition/config/util/parsingErrors.go +diff --git a/vendor/github.com/flatcar/ignition/config/util/parsingErrors.go b/vendor/github.com/flatcar/ignition/config/util/parsingErrors.go new file mode 100644 index 00000000..fbd712f3 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/util/parsingErrors.go ++++ b/vendor/github.com/flatcar/ignition/config/util/parsingErrors.go @@ -0,0 +1,74 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -6563,9 +6563,9 @@ index 00000000..fbd712f3 + "bytes" + "errors" + -+ configErrors "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/v2_4/types" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ configErrors "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/v2_4/types" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" + "go4.org/errorutil" @@ -6617,11 +6617,11 @@ index 00000000..fbd712f3 + + return report.ReportFromError(err, report.EntryError), err +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/cloudinit.go b/vendor/github.com/flatcar-linux/ignition/config/v1/cloudinit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/cloudinit.go b/vendor/github.com/flatcar/ignition/config/v1/cloudinit.go new file mode 100644 index 00000000..7cfeb455 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/cloudinit.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/cloudinit.go @@ -0,0 +1,53 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -6676,11 +6676,11 @@ index 00000000..7cfeb455 + return data + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/config.go b/vendor/github.com/flatcar-linux/ignition/config/v1/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/config.go b/vendor/github.com/flatcar/ignition/config/v1/config.go new file mode 100644 index 00000000..88c46e87 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/config.go @@ -0,0 +1,59 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -6699,11 +6699,11 @@ index 00000000..88c46e87 +package v1 + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/util" -+ "github.com/flatcar-linux/ignition/config/v1/types" -+ "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/util" ++ "github.com/flatcar/ignition/config/v1/types" ++ "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" +) @@ -6741,11 +6741,11 @@ index 00000000..88c46e87 +func isEmpty(userdata []byte) bool { + return len(userdata) == 0 +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/config.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/config.go b/vendor/github.com/flatcar/ignition/config/v1/types/config.go new file mode 100644 index 00000000..3a369e4f --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/config.go @@ -0,0 +1,35 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -6782,11 +6782,11 @@ index 00000000..3a369e4f + Networkd Networkd `json:"networkd,omitempty"` + Passwd Passwd `json:"passwd,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/disk.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/disk.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/disk.go b/vendor/github.com/flatcar/ignition/config/v1/types/disk.go new file mode 100644 index 00000000..81c41d6d --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/disk.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/disk.go @@ -0,0 +1,123 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -6805,8 +6805,8 @@ index 00000000..81c41d6d +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Disk struct { @@ -6911,11 +6911,11 @@ index 00000000..81c41d6d + } + return false +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/file.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/file.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/file.go b/vendor/github.com/flatcar/ignition/config/v1/types/file.go new file mode 100644 index 00000000..658affb9 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/file.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/file.go @@ -0,0 +1,39 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -6936,8 +6936,8 @@ index 00000000..658affb9 +import ( + "os" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type FileMode os.FileMode @@ -6956,11 +6956,11 @@ index 00000000..658affb9 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/filesystem.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/filesystem.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v1/types/filesystem.go new file mode 100644 index 00000000..0aa40ae7 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/filesystem.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/filesystem.go @@ -0,0 +1,45 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -6979,8 +6979,8 @@ index 00000000..0aa40ae7 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Filesystem struct { @@ -7007,11 +7007,11 @@ index 00000000..0aa40ae7 +} + +type MkfsOptions []string -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/group.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/group.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/group.go b/vendor/github.com/flatcar/ignition/config/v1/types/group.go new file mode 100644 index 00000000..27e51048 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/group.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/group.go @@ -0,0 +1,22 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7035,11 +7035,11 @@ index 00000000..27e51048 + PasswordHash string `json:"passwordHash,omitempty"` + System bool `json:"system,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/networkd.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/networkd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/networkd.go b/vendor/github.com/flatcar/ignition/config/v1/types/networkd.go new file mode 100644 index 00000000..470c7211 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/networkd.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/networkd.go @@ -0,0 +1,19 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7060,11 +7060,11 @@ index 00000000..470c7211 +type Networkd struct { + Units []NetworkdUnit `json:"units,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/partition.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/partition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/partition.go b/vendor/github.com/flatcar/ignition/config/v1/types/partition.go new file mode 100644 index 00000000..86c3f810 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/partition.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/partition.go @@ -0,0 +1,60 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7086,8 +7086,8 @@ index 00000000..86c3f810 + "fmt" + "regexp" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Partition struct { @@ -7126,11 +7126,11 @@ index 00000000..86c3f810 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/passwd.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/passwd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v1/types/passwd.go new file mode 100644 index 00000000..0ffff43b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/passwd.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/passwd.go @@ -0,0 +1,20 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7152,11 +7152,11 @@ index 00000000..0ffff43b + Users []User `json:"users,omitempty"` + Groups []Group `json:"groups,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/path.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/path.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/path.go b/vendor/github.com/flatcar/ignition/config/v1/types/path.go new file mode 100644 index 00000000..812318db --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/path.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/path.go @@ -0,0 +1,31 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7177,8 +7177,8 @@ index 00000000..812318db +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Path string @@ -7189,11 +7189,11 @@ index 00000000..812318db + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/raid.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/raid.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/raid.go b/vendor/github.com/flatcar/ignition/config/v1/types/raid.go new file mode 100644 index 00000000..cad9a1d2 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/raid.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/raid.go @@ -0,0 +1,44 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7212,8 +7212,8 @@ index 00000000..cad9a1d2 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Raid struct { @@ -7239,11 +7239,11 @@ index 00000000..cad9a1d2 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/storage.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/storage.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/storage.go b/vendor/github.com/flatcar/ignition/config/v1/types/storage.go new file mode 100644 index 00000000..2649751a --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/storage.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/storage.go @@ -0,0 +1,21 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7266,11 +7266,11 @@ index 00000000..2649751a + Arrays []Raid `json:"raid,omitempty"` + Filesystems []Filesystem `json:"filesystems,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/systemd.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/systemd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/systemd.go b/vendor/github.com/flatcar/ignition/config/v1/types/systemd.go new file mode 100644 index 00000000..97194b91 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/systemd.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/systemd.go @@ -0,0 +1,19 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7291,11 +7291,11 @@ index 00000000..97194b91 +type Systemd struct { + Units []SystemdUnit `json:"units,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/unit.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/unit.go b/vendor/github.com/flatcar/ignition/config/v1/types/unit.go new file mode 100644 index 00000000..52d45872 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/unit.go @@ -0,0 +1,73 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7316,8 +7316,8 @@ index 00000000..52d45872 +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type SystemdUnit struct { @@ -7370,11 +7370,11 @@ index 00000000..52d45872 + return report.ReportFromError(errors.ErrInvalidNetworkdExt, report.EntryError) + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v1/types/user.go b/vendor/github.com/flatcar-linux/ignition/config/v1/types/user.go +diff --git a/vendor/github.com/flatcar/ignition/config/v1/types/user.go b/vendor/github.com/flatcar/ignition/config/v1/types/user.go new file mode 100644 index 00000000..f6653e27 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v1/types/user.go ++++ b/vendor/github.com/flatcar/ignition/config/v1/types/user.go @@ -0,0 +1,35 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7411,11 +7411,11 @@ index 00000000..f6653e27 + NoLogInit bool `json:"noLogInit,omitempty"` + Shell string `json:"shell,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/append.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/append.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/append.go b/vendor/github.com/flatcar/ignition/config/v2_0/append.go new file mode 100644 index 00000000..e274e1ab --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/append.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/append.go @@ -0,0 +1,76 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7436,7 +7436,7 @@ index 00000000..e274e1ab +import ( + "reflect" + -+ "github.com/flatcar-linux/ignition/config/v2_0/types" ++ "github.com/flatcar/ignition/config/v2_0/types" +) + +// Append appends newConfig to oldConfig and returns the result. Appending one @@ -7493,11 +7493,11 @@ index 00000000..e274e1ab + + return vRes.Elem() +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/cloudinit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/cloudinit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/cloudinit.go b/vendor/github.com/flatcar/ignition/config/v2_0/cloudinit.go new file mode 100644 index 00000000..9e1f2ad0 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/cloudinit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/cloudinit.go @@ -0,0 +1,53 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -7552,11 +7552,11 @@ index 00000000..9e1f2ad0 + return data + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/config.go b/vendor/github.com/flatcar/ignition/config/v2_0/config.go new file mode 100644 index 00000000..b345a553 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/config.go @@ -0,0 +1,70 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -7575,11 +7575,11 @@ index 00000000..b345a553 +package v2_0 + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/v1" -+ "github.com/flatcar-linux/ignition/config/v2_0/types" -+ "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/v1" ++ "github.com/flatcar/ignition/config/v2_0/types" ++ "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" + "github.com/coreos/go-semver/semver" @@ -7628,11 +7628,11 @@ index 00000000..b345a553 +func isEmpty(userdata []byte) bool { + return len(userdata) == 0 +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/translate.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/translate.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/translate.go b/vendor/github.com/flatcar/ignition/config/v2_0/translate.go new file mode 100644 index 00000000..ee05d4b1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/translate.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/translate.go @@ -0,0 +1,173 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -7653,8 +7653,8 @@ index 00000000..ee05d4b1 +import ( + "fmt" + -+ v1 "github.com/flatcar-linux/ignition/config/v1/types" -+ "github.com/flatcar-linux/ignition/config/v2_0/types" ++ v1 "github.com/flatcar/ignition/config/v1/types" ++ "github.com/flatcar/ignition/config/v2_0/types" + "github.com/vincent-petithory/dataurl" +) + @@ -7807,11 +7807,11 @@ index 00000000..ee05d4b1 + + return config +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/compression.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/compression.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/compression.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/compression.go new file mode 100644 index 00000000..a6b65a5a --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/compression.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/compression.go @@ -0,0 +1,31 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7830,8 +7830,8 @@ index 00000000..a6b65a5a +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Compression string @@ -7844,11 +7844,11 @@ index 00000000..a6b65a5a + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/config.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/config.go new file mode 100644 index 00000000..996f6740 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/config.go @@ -0,0 +1,87 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -7871,7 +7871,7 @@ index 00000000..996f6740 + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +var ( @@ -7937,11 +7937,11 @@ index 00000000..996f6740 + filesystems[filesystem.Name] = struct{}{} + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/disk.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/disk.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/disk.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/disk.go new file mode 100644 index 00000000..21334989 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/disk.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/disk.go @@ -0,0 +1,126 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -7960,8 +7960,8 @@ index 00000000..21334989 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Disk struct { @@ -8069,11 +8069,11 @@ index 00000000..21334989 + } + return false +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/file.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/file.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/file.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/file.go new file mode 100644 index 00000000..517ed770 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/file.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/file.go @@ -0,0 +1,61 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8094,8 +8094,8 @@ index 00000000..517ed770 +import ( + "os" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type File struct { @@ -8136,11 +8136,11 @@ index 00000000..517ed770 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/filesystem.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/filesystem.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/filesystem.go new file mode 100644 index 00000000..0582dd5a --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/filesystem.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/filesystem.go @@ -0,0 +1,60 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8159,8 +8159,8 @@ index 00000000..0582dd5a +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Filesystem struct { @@ -8202,11 +8202,11 @@ index 00000000..0582dd5a +} + +type MkfsOptions []string -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/group.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/group.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/group.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/group.go new file mode 100644 index 00000000..27e51048 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/group.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/group.go @@ -0,0 +1,22 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8230,11 +8230,11 @@ index 00000000..27e51048 + PasswordHash string `json:"passwordHash,omitempty"` + System bool `json:"system,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/hash.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/hash.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/hash.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/hash.go new file mode 100644 index 00000000..530a07c6 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/hash.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/hash.go @@ -0,0 +1,72 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8258,8 +8258,8 @@ index 00000000..530a07c6 + "encoding/json" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Hash struct { @@ -8308,11 +8308,11 @@ index 00000000..530a07c6 + + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/ignition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/ignition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/ignition.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/ignition.go new file mode 100644 index 00000000..f16e9321 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/ignition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/ignition.go @@ -0,0 +1,64 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -8335,8 +8335,8 @@ index 00000000..f16e9321 + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Ignition struct { @@ -8378,11 +8378,11 @@ index 00000000..f16e9321 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/networkd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/networkd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/networkd.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/networkd.go new file mode 100644 index 00000000..470c7211 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/networkd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/networkd.go @@ -0,0 +1,19 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8403,11 +8403,11 @@ index 00000000..470c7211 +type Networkd struct { + Units []NetworkdUnit `json:"units,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/partition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/partition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/partition.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/partition.go new file mode 100644 index 00000000..c6cb0f0c --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/partition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/partition.go @@ -0,0 +1,64 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8430,8 +8430,8 @@ index 00000000..c6cb0f0c + "regexp" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Partition struct { @@ -8473,11 +8473,11 @@ index 00000000..c6cb0f0c + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/passwd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/passwd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/passwd.go new file mode 100644 index 00000000..0ffff43b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/passwd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/passwd.go @@ -0,0 +1,20 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8499,11 +8499,11 @@ index 00000000..0ffff43b + Users []User `json:"users,omitempty"` + Groups []Group `json:"groups,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/path.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/path.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/path.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/path.go new file mode 100644 index 00000000..b60f6ef1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/path.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/path.go @@ -0,0 +1,35 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8524,8 +8524,8 @@ index 00000000..b60f6ef1 +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Path string @@ -8540,11 +8540,11 @@ index 00000000..b60f6ef1 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/raid.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/raid.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/raid.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/raid.go new file mode 100644 index 00000000..cad9a1d2 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/raid.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/raid.go @@ -0,0 +1,44 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8563,8 +8563,8 @@ index 00000000..cad9a1d2 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Raid struct { @@ -8590,11 +8590,11 @@ index 00000000..cad9a1d2 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/storage.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/storage.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/storage.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/storage.go new file mode 100644 index 00000000..bd734377 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/storage.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/storage.go @@ -0,0 +1,22 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8618,11 +8618,11 @@ index 00000000..bd734377 + Filesystems []Filesystem `json:"filesystems,omitempty"` + Files []File `json:"files,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/systemd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/systemd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/systemd.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/systemd.go new file mode 100644 index 00000000..97194b91 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/systemd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/systemd.go @@ -0,0 +1,19 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8643,11 +8643,11 @@ index 00000000..97194b91 +type Systemd struct { + Units []SystemdUnit `json:"units,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/unit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/unit.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/unit.go new file mode 100644 index 00000000..a47cb2ed --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/unit.go @@ -0,0 +1,115 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8672,9 +8672,9 @@ index 00000000..a47cb2ed + + "github.com/coreos/go-systemd/unit" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/shared/validations" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/validations" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type SystemdUnit struct { @@ -8764,11 +8764,11 @@ index 00000000..a47cb2ed + } + return opts, nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/url.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/url.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/url.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/url.go new file mode 100644 index 00000000..58cf3f66 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/url.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/url.go @@ -0,0 +1,69 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8792,8 +8792,8 @@ index 00000000..58cf3f66 + + "github.com/vincent-petithory/dataurl" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type Url url.URL @@ -8839,11 +8839,11 @@ index 00000000..58cf3f66 + return report.ReportFromError(errors.ErrInvalidScheme, report.EntryError) + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/user.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/user.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/user.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/user.go new file mode 100644 index 00000000..f6653e27 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/user.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/user.go @@ -0,0 +1,35 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8880,11 +8880,11 @@ index 00000000..f6653e27 + NoLogInit bool `json:"noLogInit,omitempty"` + Shell string `json:"shell,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/verification.go b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/verification.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_0/types/verification.go b/vendor/github.com/flatcar/ignition/config/v2_0/types/verification.go new file mode 100644 index 00000000..b7cef403 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_0/types/verification.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_0/types/verification.go @@ -0,0 +1,19 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8905,11 +8905,11 @@ index 00000000..b7cef403 +type Verification struct { + Hash *Hash `json:"hash,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/append.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/append.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/append.go b/vendor/github.com/flatcar/ignition/config/v2_1/append.go new file mode 100644 index 00000000..6bbac2eb --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/append.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/append.go @@ -0,0 +1,76 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -8930,7 +8930,7 @@ index 00000000..6bbac2eb +import ( + "reflect" + -+ "github.com/flatcar-linux/ignition/config/v2_1/types" ++ "github.com/flatcar/ignition/config/v2_1/types" +) + +// Append appends newConfig to oldConfig and returns the result. Appending one @@ -8987,11 +8987,11 @@ index 00000000..6bbac2eb + + return vRes.Elem() +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/cloudinit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/cloudinit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/cloudinit.go b/vendor/github.com/flatcar/ignition/config/v2_1/cloudinit.go new file mode 100644 index 00000000..a019320f --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/cloudinit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/cloudinit.go @@ -0,0 +1,53 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -9046,11 +9046,11 @@ index 00000000..a019320f + return data + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/config.go b/vendor/github.com/flatcar/ignition/config/v2_1/config.go new file mode 100644 index 00000000..b0e31f6e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/config.go @@ -0,0 +1,68 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -9070,11 +9070,11 @@ index 00000000..b0e31f6e + +import ( + "github.com/coreos/go-semver/semver" -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/v2_0" -+ "github.com/flatcar-linux/ignition/config/v2_1/types" -+ "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/v2_0" ++ "github.com/flatcar/ignition/config/v2_1/types" ++ "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" +) @@ -9120,11 +9120,11 @@ index 00000000..b0e31f6e +func isEmpty(userdata []byte) bool { + return len(userdata) == 0 +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/translate.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/translate.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/translate.go b/vendor/github.com/flatcar/ignition/config/v2_1/translate.go new file mode 100644 index 00000000..97fe2260 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/translate.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/translate.go @@ -0,0 +1,236 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -9145,9 +9145,9 @@ index 00000000..97fe2260 +import ( + "strings" + -+ "github.com/flatcar-linux/ignition/config/util" -+ v2_0 "github.com/flatcar-linux/ignition/config/v2_0/types" -+ "github.com/flatcar-linux/ignition/config/v2_1/types" ++ "github.com/flatcar/ignition/config/util" ++ v2_0 "github.com/flatcar/ignition/config/v2_0/types" ++ "github.com/flatcar/ignition/config/v2_1/types" +) + +// golang-- @@ -9362,11 +9362,11 @@ index 00000000..97fe2260 + + return config +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/config.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/config.go new file mode 100644 index 00000000..ebcb03ab --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/config.go @@ -0,0 +1,91 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -9389,7 +9389,7 @@ index 00000000..ebcb03ab + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +var ( @@ -9459,11 +9459,11 @@ index 00000000..ebcb03ab + filesystems[filesystem.Name] = struct{}{} + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/directory.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/directory.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/directory.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/directory.go new file mode 100644 index 00000000..5bc08f9d --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/directory.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/directory.go @@ -0,0 +1,30 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -9482,7 +9482,7 @@ index 00000000..5bc08f9d +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (d Directory) ValidateMode() report.Report { @@ -9495,11 +9495,11 @@ index 00000000..5bc08f9d + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/disk.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/disk.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/disk.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/disk.go new file mode 100644 index 00000000..73c1404e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/disk.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/disk.go @@ -0,0 +1,128 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -9518,8 +9518,8 @@ index 00000000..73c1404e +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Disk) Validate() report.Report { @@ -9629,11 +9629,11 @@ index 00000000..73c1404e + } + return false +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/file.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/file.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/file.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/file.go new file mode 100644 index 00000000..266f8342 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/file.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/file.go @@ -0,0 +1,56 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -9652,8 +9652,8 @@ index 00000000..266f8342 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f File) ValidateMode() report.Report { @@ -9691,11 +9691,11 @@ index 00000000..266f8342 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/filesystem.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/filesystem.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/filesystem.go new file mode 100644 index 00000000..171c7572 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/filesystem.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/filesystem.go @@ -0,0 +1,144 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -9714,8 +9714,8 @@ index 00000000..171c7572 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f Filesystem) Validate() report.Report { @@ -9841,11 +9841,11 @@ index 00000000..171c7572 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/ignition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/ignition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/ignition.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/ignition.go new file mode 100644 index 00000000..513012e1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/ignition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/ignition.go @@ -0,0 +1,52 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -9866,8 +9866,8 @@ index 00000000..513012e1 +import ( + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c ConfigReference) ValidateSource() report.Report { @@ -9899,11 +9899,11 @@ index 00000000..513012e1 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/mode.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/mode.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/mode.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/mode.go new file mode 100644 index 00000000..d452c64d --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/mode.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/mode.go @@ -0,0 +1,26 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -9922,7 +9922,7 @@ index 00000000..d452c64d +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateMode(m int) error { @@ -9931,11 +9931,11 @@ index 00000000..d452c64d + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/node.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/node.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/node.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/node.go new file mode 100644 index 00000000..e6071e99 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/node.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/node.go @@ -0,0 +1,73 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -9956,8 +9956,8 @@ index 00000000..e6071e99 +import ( + "path/filepath" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Node) ValidateFilesystem() report.Report { @@ -10010,11 +10010,11 @@ index 00000000..e6071e99 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/partition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/partition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/partition.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/partition.go new file mode 100644 index 00000000..23c3594d --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/partition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/partition.go @@ -0,0 +1,77 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10037,8 +10037,8 @@ index 00000000..23c3594d + "regexp" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +const ( @@ -10093,11 +10093,11 @@ index 00000000..23c3594d + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/passwd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/passwd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/passwd.go new file mode 100644 index 00000000..5ca03186 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/passwd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/passwd.go @@ -0,0 +1,67 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -10116,8 +10116,8 @@ index 00000000..5ca03186 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (p PasswdUser) Validate() report.Report { @@ -10166,11 +10166,11 @@ index 00000000..5ca03186 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/path.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/path.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/path.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/path.go new file mode 100644 index 00000000..a478fd3b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/path.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/path.go @@ -0,0 +1,28 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10191,7 +10191,7 @@ index 00000000..a478fd3b +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validatePath(p string) error { @@ -10200,11 +10200,11 @@ index 00000000..a478fd3b + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/raid.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/raid.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/raid.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/raid.go new file mode 100644 index 00000000..d2b49fc1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/raid.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/raid.go @@ -0,0 +1,57 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10223,8 +10223,8 @@ index 00000000..d2b49fc1 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Raid) ValidateLevel() report.Report { @@ -10263,11 +10263,11 @@ index 00000000..d2b49fc1 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/schema.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/schema.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/schema.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/schema.go new file mode 100644 index 00000000..e0caed5e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/schema.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/schema.go @@ -0,0 +1,221 @@ +package types + @@ -10490,11 +10490,11 @@ index 00000000..e0caed5e +type Verification struct { + Hash *string `json:"hash,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/unit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/unit.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/unit.go new file mode 100644 index 00000000..f5cd1142 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/unit.go @@ -0,0 +1,109 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10519,9 +10519,9 @@ index 00000000..f5cd1142 + + "github.com/coreos/go-systemd/unit" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/shared/validations" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/validations" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (u Unit) ValidateContents() report.Report { @@ -10605,11 +10605,11 @@ index 00000000..f5cd1142 + } + return opts, nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/url.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/url.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/url.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/url.go new file mode 100644 index 00000000..f6ff3606 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/url.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/url.go @@ -0,0 +1,52 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10630,7 +10630,7 @@ index 00000000..f6ff3606 +import ( + "net/url" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" + "github.com/vincent-petithory/dataurl" +) + @@ -10663,11 +10663,11 @@ index 00000000..f6ff3606 + return errors.ErrInvalidScheme + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/verification.go b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/verification.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_1/types/verification.go b/vendor/github.com/flatcar/ignition/config/v2_1/types/verification.go new file mode 100644 index 00000000..6f77de23 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_1/types/verification.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_1/types/verification.go @@ -0,0 +1,77 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10690,8 +10690,8 @@ index 00000000..6f77de23 + "encoding/hex" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +// HashParts will return the sum and function (in that order) of the hash stored @@ -10746,11 +10746,11 @@ index 00000000..6f77de23 + + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/append.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/append.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/append.go b/vendor/github.com/flatcar/ignition/config/v2_2/append.go new file mode 100644 index 00000000..d9c75dcc --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/append.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/append.go @@ -0,0 +1,76 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -10771,7 +10771,7 @@ index 00000000..d9c75dcc +import ( + "reflect" + -+ "github.com/flatcar-linux/ignition/config/v2_2/types" ++ "github.com/flatcar/ignition/config/v2_2/types" +) + +// Append appends newConfig to oldConfig and returns the result. Appending one @@ -10828,11 +10828,11 @@ index 00000000..d9c75dcc + + return vRes.Elem() +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/cloudinit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/cloudinit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/cloudinit.go b/vendor/github.com/flatcar/ignition/config/v2_2/cloudinit.go new file mode 100644 index 00000000..36a54393 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/cloudinit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/cloudinit.go @@ -0,0 +1,53 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -10887,11 +10887,11 @@ index 00000000..36a54393 + return data + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/config.go b/vendor/github.com/flatcar/ignition/config/v2_2/config.go new file mode 100644 index 00000000..def3dba4 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/config.go @@ -0,0 +1,71 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -10910,11 +10910,11 @@ index 00000000..def3dba4 +package v2_2 + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/v2_1" -+ "github.com/flatcar-linux/ignition/config/v2_2/types" -+ "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/v2_1" ++ "github.com/flatcar/ignition/config/v2_2/types" ++ "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" + "github.com/coreos/go-semver/semver" @@ -10964,11 +10964,11 @@ index 00000000..def3dba4 +func isEmpty(userdata []byte) bool { + return len(userdata) == 0 +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/translate.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/translate.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/translate.go b/vendor/github.com/flatcar/ignition/config/v2_2/translate.go new file mode 100644 index 00000000..94c70a19 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/translate.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/translate.go @@ -0,0 +1,354 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -10987,9 +10987,9 @@ index 00000000..94c70a19 +package v2_2 + +import ( -+ "github.com/flatcar-linux/ignition/config/util" -+ v2_1 "github.com/flatcar-linux/ignition/config/v2_1/types" -+ "github.com/flatcar-linux/ignition/config/v2_2/types" ++ "github.com/flatcar/ignition/config/util" ++ v2_1 "github.com/flatcar/ignition/config/v2_1/types" ++ "github.com/flatcar/ignition/config/v2_2/types" +) + +// golang-- @@ -11324,11 +11324,11 @@ index 00000000..94c70a19 + } + return config +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ca.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ca.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/ca.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/ca.go new file mode 100644 index 00000000..d5045ff4 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ca.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/ca.go @@ -0,0 +1,27 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -11347,7 +11347,7 @@ index 00000000..d5045ff4 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c CaReference) ValidateSource() report.Report { @@ -11357,11 +11357,11 @@ index 00000000..d5045ff4 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/config.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/config.go new file mode 100644 index 00000000..0f98970c --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/config.go @@ -0,0 +1,91 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -11384,7 +11384,7 @@ index 00000000..0f98970c + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +var ( @@ -11454,11 +11454,11 @@ index 00000000..0f98970c + filesystems[filesystem.Name] = struct{}{} + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/directory.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/directory.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/directory.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/directory.go new file mode 100644 index 00000000..a86fefcb --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/directory.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/directory.go @@ -0,0 +1,37 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -11477,8 +11477,8 @@ index 00000000..a86fefcb +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (d Directory) ValidateMode() report.Report { @@ -11497,11 +11497,11 @@ index 00000000..a86fefcb + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/disk.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/disk.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/disk.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/disk.go new file mode 100644 index 00000000..73c1404e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/disk.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/disk.go @@ -0,0 +1,128 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -11520,8 +11520,8 @@ index 00000000..73c1404e +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Disk) Validate() report.Report { @@ -11631,11 +11631,11 @@ index 00000000..73c1404e + } + return false +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/file.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/file.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/file.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/file.go new file mode 100644 index 00000000..96236f37 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/file.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/file.go @@ -0,0 +1,69 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -11654,8 +11654,8 @@ index 00000000..96236f37 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f File) Validate() report.Report { @@ -11706,11 +11706,11 @@ index 00000000..96236f37 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/filesystem.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/filesystem.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/filesystem.go new file mode 100644 index 00000000..171c7572 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/filesystem.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/filesystem.go @@ -0,0 +1,144 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -11729,8 +11729,8 @@ index 00000000..171c7572 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f Filesystem) Validate() report.Report { @@ -11856,11 +11856,11 @@ index 00000000..171c7572 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ignition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ignition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/ignition.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/ignition.go new file mode 100644 index 00000000..513012e1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/ignition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/ignition.go @@ -0,0 +1,52 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -11881,8 +11881,8 @@ index 00000000..513012e1 +import ( + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c ConfigReference) ValidateSource() report.Report { @@ -11914,11 +11914,11 @@ index 00000000..513012e1 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/mode.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/mode.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/mode.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/mode.go new file mode 100644 index 00000000..e0a04917 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/mode.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/mode.go @@ -0,0 +1,26 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -11937,7 +11937,7 @@ index 00000000..e0a04917 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateMode(m *int) error { @@ -11946,11 +11946,11 @@ index 00000000..e0a04917 + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/node.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/node.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/node.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/node.go new file mode 100644 index 00000000..e6071e99 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/node.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/node.go @@ -0,0 +1,73 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -11971,8 +11971,8 @@ index 00000000..e6071e99 +import ( + "path/filepath" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Node) ValidateFilesystem() report.Report { @@ -12025,11 +12025,11 @@ index 00000000..e6071e99 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/partition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/partition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/partition.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/partition.go new file mode 100644 index 00000000..23c3594d --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/partition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/partition.go @@ -0,0 +1,77 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12052,8 +12052,8 @@ index 00000000..23c3594d + "regexp" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +const ( @@ -12108,11 +12108,11 @@ index 00000000..23c3594d + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/passwd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/passwd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/passwd.go new file mode 100644 index 00000000..5ca03186 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/passwd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/passwd.go @@ -0,0 +1,67 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -12131,8 +12131,8 @@ index 00000000..5ca03186 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (p PasswdUser) Validate() report.Report { @@ -12181,11 +12181,11 @@ index 00000000..5ca03186 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/path.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/path.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/path.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/path.go new file mode 100644 index 00000000..a478fd3b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/path.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/path.go @@ -0,0 +1,28 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12206,7 +12206,7 @@ index 00000000..a478fd3b +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validatePath(p string) error { @@ -12215,11 +12215,11 @@ index 00000000..a478fd3b + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/raid.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/raid.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/raid.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/raid.go new file mode 100644 index 00000000..d2b49fc1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/raid.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/raid.go @@ -0,0 +1,57 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12238,8 +12238,8 @@ index 00000000..d2b49fc1 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Raid) ValidateLevel() report.Report { @@ -12278,11 +12278,11 @@ index 00000000..d2b49fc1 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/schema.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/schema.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/schema.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/schema.go new file mode 100644 index 00000000..4b32b337 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/schema.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/schema.go @@ -0,0 +1,246 @@ +package types + @@ -12530,11 +12530,11 @@ index 00000000..4b32b337 +type Verification struct { + Hash *string `json:"hash,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/unit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/unit.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/unit.go new file mode 100644 index 00000000..7911c92f --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/unit.go @@ -0,0 +1,131 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12559,9 +12559,9 @@ index 00000000..7911c92f + + "github.com/coreos/go-systemd/unit" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/shared/validations" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/validations" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (u Unit) ValidateContents() report.Report { @@ -12667,11 +12667,11 @@ index 00000000..7911c92f + } + return opts, nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/url.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/url.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/url.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/url.go new file mode 100644 index 00000000..6d25e801 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/url.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/url.go @@ -0,0 +1,53 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12694,7 +12694,7 @@ index 00000000..6d25e801 + + "github.com/vincent-petithory/dataurl" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateURL(s string) error { @@ -12726,11 +12726,11 @@ index 00000000..6d25e801 + return errors.ErrInvalidScheme + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/verification.go b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/verification.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_2/types/verification.go b/vendor/github.com/flatcar/ignition/config/v2_2/types/verification.go new file mode 100644 index 00000000..6f77de23 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_2/types/verification.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_2/types/verification.go @@ -0,0 +1,77 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12753,8 +12753,8 @@ index 00000000..6f77de23 + "encoding/hex" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +// HashParts will return the sum and function (in that order) of the hash stored @@ -12809,11 +12809,11 @@ index 00000000..6f77de23 + + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/append.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/append.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/append.go b/vendor/github.com/flatcar/ignition/config/v2_3/append.go new file mode 100644 index 00000000..12e2993e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/append.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/append.go @@ -0,0 +1,76 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -12834,7 +12834,7 @@ index 00000000..12e2993e +import ( + "reflect" + -+ "github.com/flatcar-linux/ignition/config/v2_3/types" ++ "github.com/flatcar/ignition/config/v2_3/types" +) + +// Append appends newConfig to oldConfig and returns the result. Appending one @@ -12891,11 +12891,11 @@ index 00000000..12e2993e + + return vRes.Elem() +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/cloudinit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/cloudinit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/cloudinit.go b/vendor/github.com/flatcar/ignition/config/v2_3/cloudinit.go new file mode 100644 index 00000000..3b83fbd9 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/cloudinit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/cloudinit.go @@ -0,0 +1,53 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -12950,11 +12950,11 @@ index 00000000..3b83fbd9 + return data + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/config.go b/vendor/github.com/flatcar/ignition/config/v2_3/config.go new file mode 100644 index 00000000..e3a042c2 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/config.go @@ -0,0 +1,70 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -12973,11 +12973,11 @@ index 00000000..e3a042c2 +package v2_3 + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/v2_2" -+ "github.com/flatcar-linux/ignition/config/v2_3/types" -+ "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/v2_2" ++ "github.com/flatcar/ignition/config/v2_3/types" ++ "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" + "github.com/coreos/go-semver/semver" @@ -13026,11 +13026,11 @@ index 00000000..e3a042c2 +func isEmpty(userdata []byte) bool { + return len(userdata) == 0 +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/translate.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/translate.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/translate.go b/vendor/github.com/flatcar/ignition/config/v2_3/translate.go new file mode 100644 index 00000000..e14dda0a --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/translate.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/translate.go @@ -0,0 +1,380 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -13049,9 +13049,9 @@ index 00000000..e14dda0a +package v2_3 + +import ( -+ "github.com/flatcar-linux/ignition/config/util" -+ v2_2 "github.com/flatcar-linux/ignition/config/v2_2/types" -+ "github.com/flatcar-linux/ignition/config/v2_3/types" ++ "github.com/flatcar/ignition/config/util" ++ v2_2 "github.com/flatcar/ignition/config/v2_2/types" ++ "github.com/flatcar/ignition/config/v2_3/types" +) + +func Translate(old v2_2.Config) types.Config { @@ -13412,11 +13412,11 @@ index 00000000..e14dda0a + } + return config +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go new file mode 100644 index 00000000..d5045ff4 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ca.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/ca.go @@ -0,0 +1,27 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -13435,7 +13435,7 @@ index 00000000..d5045ff4 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c CaReference) ValidateSource() report.Report { @@ -13445,11 +13445,11 @@ index 00000000..d5045ff4 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/config.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/config.go new file mode 100644 index 00000000..8067cc04 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/config.go @@ -0,0 +1,91 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -13472,7 +13472,7 @@ index 00000000..8067cc04 + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +var ( @@ -13542,11 +13542,11 @@ index 00000000..8067cc04 + filesystems[filesystem.Name] = struct{}{} + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go new file mode 100644 index 00000000..a86fefcb --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/directory.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/directory.go @@ -0,0 +1,37 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -13565,8 +13565,8 @@ index 00000000..a86fefcb +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (d Directory) ValidateMode() report.Report { @@ -13585,11 +13585,11 @@ index 00000000..a86fefcb + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go new file mode 100644 index 00000000..67cab984 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/disk.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/disk.go @@ -0,0 +1,164 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -13608,8 +13608,8 @@ index 00000000..67cab984 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Disk) Validate() report.Report { @@ -13755,11 +13755,11 @@ index 00000000..67cab984 + } + return partsInMb && partsNotInMb +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/file.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/file.go new file mode 100644 index 00000000..6e2a0c7a --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/file.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/file.go @@ -0,0 +1,71 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -13780,8 +13780,8 @@ index 00000000..6e2a0c7a +import ( + "fmt" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f File) Validate() report.Report { @@ -13832,11 +13832,11 @@ index 00000000..6e2a0c7a + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go new file mode 100644 index 00000000..ccc71660 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/filesystem.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/filesystem.go @@ -0,0 +1,146 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -13857,8 +13857,8 @@ index 00000000..ccc71660 +import ( + "fmt" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f Filesystem) Validate() report.Report { @@ -13984,11 +13984,11 @@ index 00000000..ccc71660 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go new file mode 100644 index 00000000..513012e1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/ignition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/ignition.go @@ -0,0 +1,52 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -14009,8 +14009,8 @@ index 00000000..513012e1 +import ( + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c ConfigReference) ValidateSource() report.Report { @@ -14042,11 +14042,11 @@ index 00000000..513012e1 + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go new file mode 100644 index 00000000..e0a04917 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/mode.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/mode.go @@ -0,0 +1,26 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -14065,7 +14065,7 @@ index 00000000..e0a04917 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateMode(m *int) error { @@ -14074,11 +14074,11 @@ index 00000000..e0a04917 + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/node.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/node.go new file mode 100644 index 00000000..e6071e99 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/node.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/node.go @@ -0,0 +1,73 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14099,8 +14099,8 @@ index 00000000..e6071e99 +import ( + "path/filepath" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Node) ValidateFilesystem() report.Report { @@ -14153,11 +14153,11 @@ index 00000000..e6071e99 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go new file mode 100644 index 00000000..e2b0736e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/partition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/partition.go @@ -0,0 +1,112 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14180,8 +14180,8 @@ index 00000000..e2b0736e + "regexp" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +const ( @@ -14271,11 +14271,11 @@ index 00000000..e2b0736e + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go new file mode 100644 index 00000000..5ca03186 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/passwd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/passwd.go @@ -0,0 +1,67 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -14294,8 +14294,8 @@ index 00000000..5ca03186 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (p PasswdUser) Validate() report.Report { @@ -14344,11 +14344,11 @@ index 00000000..5ca03186 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/path.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/path.go new file mode 100644 index 00000000..a478fd3b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/path.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/path.go @@ -0,0 +1,28 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14369,7 +14369,7 @@ index 00000000..a478fd3b +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validatePath(p string) error { @@ -14378,11 +14378,11 @@ index 00000000..a478fd3b + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go new file mode 100644 index 00000000..d2b49fc1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/raid.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/raid.go @@ -0,0 +1,57 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14401,8 +14401,8 @@ index 00000000..d2b49fc1 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Raid) ValidateLevel() report.Report { @@ -14441,11 +14441,11 @@ index 00000000..d2b49fc1 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/schema.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/schema.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/schema.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/schema.go new file mode 100644 index 00000000..5f91b71e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/schema.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/schema.go @@ -0,0 +1,250 @@ +package types + @@ -14697,11 +14697,11 @@ index 00000000..5f91b71e +type Verification struct { + Hash *string `json:"hash,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go new file mode 100644 index 00000000..7911c92f --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/unit.go @@ -0,0 +1,131 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14726,9 +14726,9 @@ index 00000000..7911c92f + + "github.com/coreos/go-systemd/unit" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/shared/validations" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/validations" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (u Unit) ValidateContents() report.Report { @@ -14834,11 +14834,11 @@ index 00000000..7911c92f + } + return opts, nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/url.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/url.go new file mode 100644 index 00000000..6d25e801 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/url.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/url.go @@ -0,0 +1,53 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14861,7 +14861,7 @@ index 00000000..6d25e801 + + "github.com/vincent-petithory/dataurl" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateURL(s string) error { @@ -14893,11 +14893,11 @@ index 00000000..6d25e801 + return errors.ErrInvalidScheme + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go b/vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go new file mode 100644 index 00000000..6f77de23 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_3/types/verification.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_3/types/verification.go @@ -0,0 +1,77 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -14920,8 +14920,8 @@ index 00000000..6f77de23 + "encoding/hex" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +// HashParts will return the sum and function (in that order) of the hash stored @@ -14976,11 +14976,11 @@ index 00000000..6f77de23 + + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/append.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/append.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/append.go b/vendor/github.com/flatcar/ignition/config/v2_4/append.go new file mode 100644 index 00000000..5246f7dd --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/append.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/append.go @@ -0,0 +1,76 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -15001,7 +15001,7 @@ index 00000000..5246f7dd +import ( + "reflect" + -+ "github.com/flatcar-linux/ignition/config/v2_4/types" ++ "github.com/flatcar/ignition/config/v2_4/types" +) + +// Append appends newConfig to oldConfig and returns the result. Appending one @@ -15058,11 +15058,11 @@ index 00000000..5246f7dd + + return vRes.Elem() +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/cloudinit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/cloudinit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/cloudinit.go b/vendor/github.com/flatcar/ignition/config/v2_4/cloudinit.go new file mode 100644 index 00000000..0c428e62 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/cloudinit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/cloudinit.go @@ -0,0 +1,53 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -15117,11 +15117,11 @@ index 00000000..0c428e62 + return data + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/config.go b/vendor/github.com/flatcar/ignition/config/v2_4/config.go new file mode 100644 index 00000000..27d3c0c9 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/config.go @@ -0,0 +1,70 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -15140,11 +15140,11 @@ index 00000000..27d3c0c9 +package v2_4 + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/v2_3" -+ "github.com/flatcar-linux/ignition/config/v2_4/types" -+ "github.com/flatcar-linux/ignition/config/validate" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/v2_3" ++ "github.com/flatcar/ignition/config/v2_4/types" ++ "github.com/flatcar/ignition/config/validate" ++ "github.com/flatcar/ignition/config/validate/report" + + json "github.com/ajeddeloh/go-json" + "github.com/coreos/go-semver/semver" @@ -15193,11 +15193,11 @@ index 00000000..27d3c0c9 +func isEmpty(userdata []byte) bool { + return len(userdata) == 0 +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/translate.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/translate.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/translate.go b/vendor/github.com/flatcar/ignition/config/v2_4/translate.go new file mode 100644 index 00000000..770eee61 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/translate.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/translate.go @@ -0,0 +1,398 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -15216,8 +15216,8 @@ index 00000000..770eee61 +package v2_4 + +import ( -+ from "github.com/flatcar-linux/ignition/config/v2_3/types" -+ "github.com/flatcar-linux/ignition/config/v2_4/types" ++ from "github.com/flatcar/ignition/config/v2_3/types" ++ "github.com/flatcar/ignition/config/v2_4/types" +) + +func intToPtr(x int) *int { @@ -15597,11 +15597,11 @@ index 00000000..770eee61 + } + return config +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ca.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ca.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/ca.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/ca.go new file mode 100644 index 00000000..3955fd22 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ca.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/ca.go @@ -0,0 +1,58 @@ +// Copyright 2018 CoreOS, Inc. +// @@ -15622,8 +15622,8 @@ index 00000000..3955fd22 +import ( + "net/url" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c CaReference) ValidateSource() report.Report { @@ -15661,11 +15661,11 @@ index 00000000..3955fd22 + + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/config.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/config.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/config.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/config.go new file mode 100644 index 00000000..ceb79e9e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/config.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/config.go @@ -0,0 +1,91 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -15688,7 +15688,7 @@ index 00000000..ceb79e9e + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/report" +) + +var ( @@ -15758,11 +15758,11 @@ index 00000000..ceb79e9e + filesystems[filesystem.Name] = struct{}{} + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/directory.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/directory.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/directory.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/directory.go new file mode 100644 index 00000000..a86fefcb --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/directory.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/directory.go @@ -0,0 +1,37 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -15781,8 +15781,8 @@ index 00000000..a86fefcb +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (d Directory) ValidateMode() report.Report { @@ -15801,11 +15801,11 @@ index 00000000..a86fefcb + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/disk.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/disk.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/disk.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/disk.go new file mode 100644 index 00000000..67cab984 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/disk.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/disk.go @@ -0,0 +1,164 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -15824,8 +15824,8 @@ index 00000000..67cab984 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Disk) Validate() report.Report { @@ -15971,11 +15971,11 @@ index 00000000..67cab984 + } + return partsInMb && partsNotInMb +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/file.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/file.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/file.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/file.go new file mode 100644 index 00000000..6bc717fe --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/file.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/file.go @@ -0,0 +1,100 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -15997,8 +15997,8 @@ index 00000000..6bc717fe + "fmt" + "net/url" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f File) Validate() report.Report { @@ -16077,11 +16077,11 @@ index 00000000..6bc717fe + + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/filesystem.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/filesystem.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/filesystem.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/filesystem.go new file mode 100644 index 00000000..ccc71660 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/filesystem.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/filesystem.go @@ -0,0 +1,146 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -16102,8 +16102,8 @@ index 00000000..ccc71660 +import ( + "fmt" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (f Filesystem) Validate() report.Report { @@ -16229,11 +16229,11 @@ index 00000000..ccc71660 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/headers.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/headers.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/headers.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/headers.go new file mode 100644 index 00000000..3d34587a --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/headers.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/headers.go @@ -0,0 +1,47 @@ +// Copyright 2020 Red Hat, Inc. +// @@ -16252,8 +16252,8 @@ index 00000000..3d34587a +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" + + "fmt" +) @@ -16282,11 +16282,11 @@ index 00000000..3d34587a + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ignition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ignition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/ignition.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/ignition.go new file mode 100644 index 00000000..a6e2bc6e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/ignition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/ignition.go @@ -0,0 +1,82 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -16309,8 +16309,8 @@ index 00000000..a6e2bc6e + + "github.com/coreos/go-semver/semver" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (c ConfigReference) ValidateSource() report.Report { @@ -16370,11 +16370,11 @@ index 00000000..a6e2bc6e + } + return report.Report{} +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/mode.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/mode.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/mode.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/mode.go new file mode 100644 index 00000000..e0a04917 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/mode.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/mode.go @@ -0,0 +1,26 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -16393,7 +16393,7 @@ index 00000000..e0a04917 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateMode(m *int) error { @@ -16402,11 +16402,11 @@ index 00000000..e0a04917 + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/node.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/node.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/node.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/node.go new file mode 100644 index 00000000..e6071e99 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/node.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/node.go @@ -0,0 +1,73 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -16427,8 +16427,8 @@ index 00000000..e6071e99 +import ( + "path/filepath" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Node) ValidateFilesystem() report.Report { @@ -16481,11 +16481,11 @@ index 00000000..e6071e99 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/partition.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/partition.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/partition.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/partition.go new file mode 100644 index 00000000..e2b0736e --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/partition.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/partition.go @@ -0,0 +1,112 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -16508,8 +16508,8 @@ index 00000000..e2b0736e + "regexp" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +const ( @@ -16599,11 +16599,11 @@ index 00000000..e2b0736e + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/passwd.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/passwd.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/passwd.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/passwd.go new file mode 100644 index 00000000..5ca03186 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/passwd.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/passwd.go @@ -0,0 +1,67 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -16622,8 +16622,8 @@ index 00000000..5ca03186 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (p PasswdUser) Validate() report.Report { @@ -16672,11 +16672,11 @@ index 00000000..5ca03186 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/path.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/path.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/path.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/path.go new file mode 100644 index 00000000..a478fd3b --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/path.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/path.go @@ -0,0 +1,28 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -16697,7 +16697,7 @@ index 00000000..a478fd3b +import ( + "path" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validatePath(p string) error { @@ -16706,11 +16706,11 @@ index 00000000..a478fd3b + } + return nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/raid.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/raid.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/raid.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/raid.go new file mode 100644 index 00000000..d2b49fc1 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/raid.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/raid.go @@ -0,0 +1,57 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -16729,8 +16729,8 @@ index 00000000..d2b49fc1 +package types + +import ( -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (n Raid) ValidateLevel() report.Report { @@ -16769,11 +16769,11 @@ index 00000000..d2b49fc1 + } + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/schema.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/schema.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/schema.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/schema.go new file mode 100644 index 00000000..4bf7ec84 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/schema.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/schema.go @@ -0,0 +1,269 @@ +package types + @@ -17044,11 +17044,11 @@ index 00000000..4bf7ec84 +type Verification struct { + Hash *string `json:"hash,omitempty"` +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/unit.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/unit.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/unit.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/unit.go new file mode 100644 index 00000000..7911c92f --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/unit.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/unit.go @@ -0,0 +1,131 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -17073,9 +17073,9 @@ index 00000000..7911c92f + + "github.com/coreos/go-systemd/unit" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/shared/validations" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/validations" ++ "github.com/flatcar/ignition/config/validate/report" +) + +func (u Unit) ValidateContents() report.Report { @@ -17181,11 +17181,11 @@ index 00000000..7911c92f + } + return opts, nil +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/url.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/url.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/url.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/url.go new file mode 100644 index 00000000..6d25e801 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/url.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/url.go @@ -0,0 +1,53 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -17208,7 +17208,7 @@ index 00000000..6d25e801 + + "github.com/vincent-petithory/dataurl" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/shared/errors" +) + +func validateURL(s string) error { @@ -17240,11 +17240,11 @@ index 00000000..6d25e801 + return errors.ErrInvalidScheme + } +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/verification.go b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/verification.go +diff --git a/vendor/github.com/flatcar/ignition/config/v2_4/types/verification.go b/vendor/github.com/flatcar/ignition/config/v2_4/types/verification.go new file mode 100644 index 00000000..6f77de23 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/v2_4/types/verification.go ++++ b/vendor/github.com/flatcar/ignition/config/v2_4/types/verification.go @@ -0,0 +1,77 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -17267,8 +17267,8 @@ index 00000000..6f77de23 + "encoding/hex" + "strings" + -+ "github.com/flatcar-linux/ignition/config/shared/errors" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/shared/errors" ++ "github.com/flatcar/ignition/config/validate/report" +) + +// HashParts will return the sum and function (in that order) of the hash stored @@ -17323,11 +17323,11 @@ index 00000000..6f77de23 + + return r +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go b/vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go +diff --git a/vendor/github.com/flatcar/ignition/config/validate/astjson/node.go b/vendor/github.com/flatcar/ignition/config/validate/astjson/node.go new file mode 100644 index 00000000..40f24a74 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/validate/astjson/node.go ++++ b/vendor/github.com/flatcar/ignition/config/validate/astjson/node.go @@ -0,0 +1,73 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -17349,7 +17349,7 @@ index 00000000..40f24a74 + "io" + + json "github.com/ajeddeloh/go-json" -+ "github.com/flatcar-linux/ignition/config/validate/astnode" ++ "github.com/flatcar/ignition/config/validate/astnode" + "go4.org/errorutil" +) + @@ -17402,11 +17402,11 @@ index 00000000..40f24a74 + source.Seek(0, 0) // Reset the reader to the start so the next call isn't relative to this position + return line, col, highlight +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/astnode/astnode.go b/vendor/github.com/flatcar-linux/ignition/config/validate/astnode/astnode.go +diff --git a/vendor/github.com/flatcar/ignition/config/validate/astnode/astnode.go b/vendor/github.com/flatcar/ignition/config/validate/astnode/astnode.go new file mode 100644 index 00000000..d1c1d9c2 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/validate/astnode/astnode.go ++++ b/vendor/github.com/flatcar/ignition/config/validate/astnode/astnode.go @@ -0,0 +1,45 @@ +// Copyright 2017 CoreOS, Inc. +// @@ -17453,11 +17453,11 @@ index 00000000..d1c1d9c2 + // Tag returns the struct tag used in the config structure used to unmarshal. + Tag() string +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/report/report.go b/vendor/github.com/flatcar-linux/ignition/config/validate/report/report.go +diff --git a/vendor/github.com/flatcar/ignition/config/validate/report/report.go b/vendor/github.com/flatcar/ignition/config/validate/report/report.go new file mode 100644 index 00000000..e0d4fed8 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/validate/report/report.go ++++ b/vendor/github.com/flatcar/ignition/config/validate/report/report.go @@ -0,0 +1,158 @@ +// Copyright 2016 CoreOS, Inc. +// @@ -17617,11 +17617,11 @@ index 00000000..e0d4fed8 +func (e entryKind) MarshalJSON() ([]byte, error) { + return json.Marshal(e.String()) +} -diff --git a/vendor/github.com/flatcar-linux/ignition/config/validate/validate.go b/vendor/github.com/flatcar-linux/ignition/config/validate/validate.go +diff --git a/vendor/github.com/flatcar/ignition/config/validate/validate.go b/vendor/github.com/flatcar/ignition/config/validate/validate.go new file mode 100644 index 00000000..54c036e4 --- /dev/null -+++ b/vendor/github.com/flatcar-linux/ignition/config/validate/validate.go ++++ b/vendor/github.com/flatcar/ignition/config/validate/validate.go @@ -0,0 +1,242 @@ +// Copyright 2015 CoreOS, Inc. +// @@ -17647,9 +17647,9 @@ index 00000000..54c036e4 + "strings" + + json "github.com/ajeddeloh/go-json" -+ "github.com/flatcar-linux/ignition/config/validate/astjson" -+ "github.com/flatcar-linux/ignition/config/validate/astnode" -+ "github.com/flatcar-linux/ignition/config/validate/report" ++ "github.com/flatcar/ignition/config/validate/astjson" ++ "github.com/flatcar/ignition/config/validate/astnode" ++ "github.com/flatcar/ignition/config/validate/report" +) + +type validator interface { @@ -28499,31 +28499,31 @@ index 34bc6c6e..71ec1839 100644 github.com/coreos/vcontext/validate # github.com/davecgh/go-spew v1.1.0 github.com/davecgh/go-spew/spew -+# github.com/flatcar-linux/ign-converter v0.2.0 ++# github.com/flatcar/ign-converter v0.2.0 +## explicit -+github.com/flatcar-linux/ign-converter/translate/v24tov31 -+github.com/flatcar-linux/ign-converter/util -+# github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba ++github.com/flatcar/ign-converter/translate/v24tov31 ++github.com/flatcar/ign-converter/util ++# github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba +## explicit -+github.com/flatcar-linux/ignition/config/shared/errors -+github.com/flatcar-linux/ignition/config/shared/validations -+github.com/flatcar-linux/ignition/config/util -+github.com/flatcar-linux/ignition/config/v1 -+github.com/flatcar-linux/ignition/config/v1/types -+github.com/flatcar-linux/ignition/config/v2_0 -+github.com/flatcar-linux/ignition/config/v2_0/types -+github.com/flatcar-linux/ignition/config/v2_1 -+github.com/flatcar-linux/ignition/config/v2_1/types -+github.com/flatcar-linux/ignition/config/v2_2 -+github.com/flatcar-linux/ignition/config/v2_2/types -+github.com/flatcar-linux/ignition/config/v2_3 -+github.com/flatcar-linux/ignition/config/v2_3/types -+github.com/flatcar-linux/ignition/config/v2_4 -+github.com/flatcar-linux/ignition/config/v2_4/types -+github.com/flatcar-linux/ignition/config/validate -+github.com/flatcar-linux/ignition/config/validate/astjson -+github.com/flatcar-linux/ignition/config/validate/astnode -+github.com/flatcar-linux/ignition/config/validate/report ++github.com/flatcar/ignition/config/shared/errors ++github.com/flatcar/ignition/config/shared/validations ++github.com/flatcar/ignition/config/util ++github.com/flatcar/ignition/config/v1 ++github.com/flatcar/ignition/config/v1/types ++github.com/flatcar/ignition/config/v2_0 ++github.com/flatcar/ignition/config/v2_0/types ++github.com/flatcar/ignition/config/v2_1 ++github.com/flatcar/ignition/config/v2_1/types ++github.com/flatcar/ignition/config/v2_2 ++github.com/flatcar/ignition/config/v2_2/types ++github.com/flatcar/ignition/config/v2_3 ++github.com/flatcar/ignition/config/v2_3/types ++github.com/flatcar/ignition/config/v2_4 ++github.com/flatcar/ignition/config/v2_4/types ++github.com/flatcar/ignition/config/validate ++github.com/flatcar/ignition/config/validate/astjson ++github.com/flatcar/ignition/config/validate/astnode ++github.com/flatcar/ignition/config/validate/report # github.com/godbus/dbus/v5 v5.0.3 github.com/godbus/dbus/v5 # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.1.patch deleted file mode 100644 index 39882b7d05..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.1.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 5c730b1c2928f8246237b3d378d6bd6815a12e2c Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Tue, 27 Jul 2021 11:46:49 +0200 -Subject: [PATCH 05/16] config/v3_4: convert ignition 2.x to 3.1 - -if the version of ignition is 2.x we convert it to 3.1 using -ign-converter. - -it shoud support any 2.x version (or at the least the last 2 releases) - -Signed-off-by: Mathieu Tortuyaux ---- - config/v3_4_experimental/config.go | 38 ++++++++++++++++++++++++++++++ - 1 file changed, 38 insertions(+) - -diff --git a/config/v3_4_experimental/config.go b/config/v3_4_experimental/config.go -index 512fc9f0..b0375236 100644 ---- a/config/v3_4_experimental/config.go -+++ b/config/v3_4_experimental/config.go -@@ -15,6 +15,10 @@ - package v3_4_experimental - - import ( -+ "encoding/json" -+ "fmt" -+ -+ "github.com/flatcar-linux/ignition/config/v2_4" - "github.com/flatcar-linux/ignition/v2/config/merge" - "github.com/flatcar-linux/ignition/v2/config/shared/errors" - "github.com/flatcar-linux/ignition/v2/config/util" -@@ -25,6 +29,8 @@ import ( - - "github.com/coreos/go-semver/semver" - "github.com/coreos/vcontext/report" -+ -+ "github.com/flatcar-linux/ign-converter/translate/v24tov31" - ) - - func Merge(parent, child types.Config) types.Config { -@@ -67,6 +73,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.34.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch index 9c66669487..8ab7fafcf7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-config-v3_4-convert-ignition-2.x-to-3.4-exp.patch @@ -24,16 +24,16 @@ index 512fc9f0..b0375236 100644 + "encoding/json" + "fmt" + -+ "github.com/flatcar-linux/ignition/config/v2_4" - "github.com/flatcar-linux/ignition/v2/config/merge" - "github.com/flatcar-linux/ignition/v2/config/shared/errors" - "github.com/flatcar-linux/ignition/v2/config/util" ++ "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" @@ -25,6 +29,8 @@ import ( "github.com/coreos/go-semver/semver" "github.com/coreos/vcontext/report" + -+ "github.com/flatcar-linux/ign-converter/translate/v24tov31" ++ "github.com/flatcar/ign-converter/translate/v24tov31" ) func Merge(parent, child types.Config) types.Config { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patche.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patche.patch deleted file mode 100644 index 28825bcebc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-internal-prv-cmdline-backport-flatcar-patche.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6581b0c3359a77c364d9f776557db8b96b4561c6 Mon Sep 17 00:00:00 2001 -From: Mathieu Tortuyaux -Date: Fri, 30 Jul 2021 14:21:31 +0200 -Subject: [PATCH 06/16] internal/prv/cmdline: backport flatcar patche - -this patch provides backward compatiblity for various config -key - -Signed-off-by: Mathieu Tortuyaux ---- - internal/providers/cmdline/cmdline.go | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index 0068ed66..80b3af95 100644 ---- a/internal/providers/cmdline/cmdline.go -+++ b/internal/providers/cmdline/cmdline.go -@@ -33,7 +33,9 @@ import ( - ) - - const ( -- cmdlineUrlFlag = "ignition.config.url" -+ cmdlineUrlFlagLegacyCoreOS = "coreos.config.url" -+ cmdlineUrlFlagLegacy = "flatcar.config.url" -+ cmdlineUrlFlag = "ignition.config.url" - ) - - func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { -@@ -82,7 +84,7 @@ func parseCmdline(cmdline []byte) (url string) { - parts := strings.SplitN(strings.TrimSpace(arg), "=", 2) - key := parts[0] - -- if key != cmdlineUrlFlag { -+ if !(key == cmdlineUrlFlagLegacy || key == cmdlineUrlFlagLegacyCoreOS || key == cmdlineUrlFlag) { - continue - } - --- -2.34.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch index 904b7a3d66..1c37f87a6a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-provider-qemu-apply-fw_cfg-patch.patch @@ -18,10 +18,10 @@ index a4ebec6a..0ae9cd66 100644 "strings" "time" -+ iErrors "github.com/flatcar-linux/ignition/v2/config/shared/errors" - "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" - "github.com/flatcar-linux/ignition/v2/internal/providers/util" - "github.com/flatcar-linux/ignition/v2/internal/resource" ++ iErrors "github.com/flatcar/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" @@ -37,9 +38,11 @@ import ( "github.com/coreos/vcontext/report" ) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index 8753402022..c0cf32f0c0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -34,8 +34,8 @@ index 66ff5490..327ad52b 100644 "fmt" + "net/url" - "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" - "github.com/flatcar-linux/ignition/v2/internal/providers" + "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar/ignition/v2/internal/providers" @@ -50,26 +51,85 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { return types.Config{}, report.Report{}, providers.ErrNoProvider } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch index c46fdb92c2..6641efcd83 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-config-version-handle-configuration-version-1.patch @@ -22,7 +22,7 @@ index 9fb88d8e..89d815b8 100644 import ( + "strconv" + - "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/shared/errors" "github.com/coreos/go-semver/semver" @@ -24,6 +26,7 @@ type versionStub struct { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch index cfdbd00d9a..b7810a3b02 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-util-add-cloud-init-detection-to-initial-pars.patch @@ -27,7 +27,7 @@ index 5e2b4a2b..061a488d 100644 + "strings" + "unicode" - "github.com/flatcar-linux/ignition/v2/config/shared/errors" + "github.com/flatcar/ignition/v2/config/shared/errors" @@ -24,10 +29,44 @@ import ( "github.com/coreos/vcontext/tree" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch index c0495b888f..8b3f27c53b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-Revert-drop-OEM-URI-support.patch @@ -102,7 +102,7 @@ index 0fe37f4a..3afc587f 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -23,13 +23,17 @@ import ( - // -X github.com/flatcar-linux/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm + // -X github.com/flatcar/ignition/v2/internal/distro.mdadmCmd=/opt/bin/mdadm var ( // Device node directories and paths - diskByLabelDir = "/dev/disk/by-label" @@ -151,11 +151,11 @@ index 25993094..8ed6efdb 100644 "cloud.google.com/go/compute/metadata" "cloud.google.com/go/storage" - configErrors "github.com/flatcar-linux/ignition/v2/config/shared/errors" -+ "github.com/flatcar-linux/ignition/v2/internal/distro" - "github.com/flatcar-linux/ignition/v2/internal/log" -+ "github.com/flatcar-linux/ignition/v2/internal/systemd" - "github.com/flatcar-linux/ignition/v2/internal/util" + configErrors "github.com/flatcar/ignition/v2/config/shared/errors" ++ "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/log" ++ "github.com/flatcar/ignition/v2/internal/systemd" + "github.com/flatcar/ignition/v2/internal/util" "golang.org/x/oauth2/google" "google.golang.org/api/option" @@ -145,6 +149,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch index 15a8600498..63038ddb12 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-exec-stages-disks-prevent-races-with-udev.patch @@ -38,8 +38,8 @@ index 285e7e4a..b4c2bede 100644 "os/exec" + "path/filepath" - "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" - "github.com/flatcar-linux/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" @@ -105,35 +106,39 @@ func (s stage) Run(config types.Config) error { return fmt.Errorf("failed to create filesystems: %v", err) } @@ -172,8 +172,8 @@ index dff93413..7840d8fc 100644 "os/exec" + "strings" - "github.com/flatcar-linux/ignition/v2/config/v3_4_experimental/types" - "github.com/flatcar-linux/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/config/v3_4_experimental/types" + "github.com/flatcar/ignition/v2/internal/distro" @@ -78,6 +79,17 @@ func (s stage) createRaids(config types.Config) error { ); err != nil { return fmt.Errorf("mdadm failed: %v", err) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch index ca4f281fae..4986573b54 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch @@ -19,9 +19,9 @@ index 9b5da9f3..3e201cfd 100644 github.com/coreos/go-semver v0.3.0 github.com/coreos/go-systemd/v22 v22.0.0 github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4 -- github.com/flatcar-linux/ign-converter v0.2.0 -+ github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0 - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba +- github.com/flatcar/ign-converter v0.2.0 ++ github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0 + github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba github.com/google/renameio v0.1.0 github.com/google/uuid v1.1.1 diff --git a/go.sum b/go.sum @@ -32,17 +32,17 @@ index afe8e529..82290ed3 100644 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= --github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8= --github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= -+github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0 h1:7AIVpKuKQ2tUgczrGlR5A3vCqEizqmE2YFLhOnyZtIQ= -+github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= - github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= - github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= -diff --git a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go +-github.com/flatcar/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8= +-github.com/flatcar/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= ++github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0 h1:7AIVpKuKQ2tUgczrGlR5A3vCqEizqmE2YFLhOnyZtIQ= ++github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y= + github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M= + github.com/flatcar/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE= + github.com/flatcar/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM= +diff --git a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go index d10cd7c3..f940b421 100644 ---- a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go -+++ b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go +--- a/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go ++++ b/vendor/github.com/flatcar/ign-converter/translate/v24tov31/v24tov31.go @@ -534,7 +534,7 @@ func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.Fi file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", u.Name) @@ -69,11 +69,11 @@ index 71ec1839..3e8983d0 100644 github.com/coreos/vcontext/validate # github.com/davecgh/go-spew v1.1.0 github.com/davecgh/go-spew/spew --# github.com/flatcar-linux/ign-converter v0.2.0 -+# github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0 +-# github.com/flatcar/ign-converter v0.2.0 ++# github.com/flatcar/ign-converter v0.2.1-0.20220727141303-4991326b64e0 ## explicit - github.com/flatcar-linux/ign-converter/translate/v24tov31 - github.com/flatcar-linux/ign-converter/util + github.com/flatcar/ign-converter/translate/v24tov31 + github.com/flatcar/ign-converter/util -- 2.35.1