diff --git a/0002-allow-multiple-mounts-of-same-device.patch b/0002-allow-multiple-mounts-of-same-device.patch index 13d491d..3cd3b8b 100644 --- a/0002-allow-multiple-mounts-of-same-device.patch +++ b/0002-allow-multiple-mounts-of-same-device.patch @@ -6,10 +6,10 @@ Upstream: Ticket opened [gh#coreos/ignition#890] e.g. to mount several subvolumes from a Btrfs device or bind mounting the device to multiple places, by also adding the path to the key. -Index: ignition-2.3.0/config/v3_1/types/filesystem.go +Index: ignition-2.4.0/config/v3_1/types/filesystem.go =================================================================== ---- ignition-2.3.0.orig/config/v3_1/types/filesystem.go -+++ ignition-2.3.0/config/v3_1/types/filesystem.go +--- ignition-2.4.0.orig/config/v3_1/types/filesystem.go ++++ ignition-2.4.0/config/v3_1/types/filesystem.go @@ -23,7 +23,7 @@ import ( ) @@ -19,10 +19,10 @@ Index: ignition-2.3.0/config/v3_1/types/filesystem.go } func (f Filesystem) IgnoreDuplicates() map[string]struct{} { -Index: ignition-2.3.0/config/v3_2/types/filesystem.go +Index: ignition-2.4.0/config/v3_2/types/filesystem.go =================================================================== ---- ignition-2.3.0.orig/config/v3_2/types/filesystem.go -+++ ignition-2.3.0/config/v3_2/types/filesystem.go +--- ignition-2.4.0.orig/config/v3_2/types/filesystem.go ++++ ignition-2.4.0/config/v3_2/types/filesystem.go @@ -23,7 +23,7 @@ import ( ) @@ -32,10 +32,23 @@ Index: ignition-2.3.0/config/v3_2/types/filesystem.go } func (f Filesystem) IgnoreDuplicates() map[string]struct{} { -Index: ignition-2.3.0/config/v3_3_experimental/types/filesystem.go +Index: ignition-2.4.0/config/v3_3/types/filesystem.go =================================================================== ---- ignition-2.3.0.orig/config/v3_3_experimental/types/filesystem.go -+++ ignition-2.3.0/config/v3_3_experimental/types/filesystem.go +--- ignition-2.4.0.orig/config/v3_3/types/filesystem.go ++++ ignition-2.4.0/config/v3_3/types/filesystem.go +@@ -23,7 +23,7 @@ import ( + ) + + func (f Filesystem) Key() string { +- return f.Device ++ return f.Device + *f.Path + } + + func (f Filesystem) IgnoreDuplicates() map[string]struct{} { +Index: ignition-2.4.0/config/v3_4_experimental/types/filesystem.go +=================================================================== +--- ignition-2.4.0.orig/config/v3_4_experimental/types/filesystem.go ++++ ignition-2.4.0/config/v3_4_experimental/types/filesystem.go @@ -23,7 +23,7 @@ import ( ) diff --git a/_service b/_service index 0a28e3e..e840cad 100644 --- a/_service +++ b/_service @@ -1,8 +1,7 @@ - @PARENT_TAG@ - v(.*) - 3885b9f07c96baf7dcc12c85b914ded151c8fd6e + 2.11.0 + v2.11.0 git://github.com/coreos/ignition.git git enable diff --git a/_servicedata b/_servicedata index 04c5c5c..45a8dd1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/coreos/ignition.git - df082938ffe384268d07352174c2509dc18e8f4f + c10c5d4ed00ea05d42223e2877d8f9bdb9f1ce49 \ No newline at end of file diff --git a/ignition-2.10.1.tar.xz b/ignition-2.10.1.tar.xz deleted file mode 100644 index 437edab..0000000 --- a/ignition-2.10.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fae155cd5260737239f85bb4d24215a01278941e15a7c5614bbb4db31e11187e -size 2277352 diff --git a/ignition-2.11.0.tar.xz b/ignition-2.11.0.tar.xz new file mode 100644 index 0000000..527c4db --- /dev/null +++ b/ignition-2.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3f05956d04ce608d8f613313c5462e9bcddcbdc9feb2671ac73925a3c1dace9 +size 2280028 diff --git a/ignition.changes b/ignition.changes index 1febc99..ea2d78b 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Wed Jul 07 16:39:04 UTC 2021 - iforster@suse.com + +- Update to version 2.11.0: + * news: add notes for 2.11.0 + * Upgraded docs + * config/*: return report from previous parser when chaining + * config/*: re-order testcases by version + * tree: update for stable v3.3.0 and new v3.4.0-experimental + * config/v3_4_experimental: adapt for experimental + * config/v3_4_experimental: copy from config/v3_3 + * config/v3_3: adapt for stabilization + * config/v3_3_experimental: rename to config/v3_3 + * config/v3_3_exp: pointerify ClevisCustom Config and Pin + * config/v3_3_exp: pointerify Raid.Level + * config/v3_3_exp: pointerify LinkEmbedded1.Target + * stages/disks: simplify a check + * config/v3_1/translate: don't point to field from input struct + * config/v3_3_exp: drop devices from schema "required" field + * config/*: validate that storage.raid.devices is non-empty + * config/*/types: add RAID validation tests + * config/shared/errors: fix ErrSparesUnsupportedForLevel message + * config: fix comment + * *: formally bump Go to 1.13 + * platform: add powervs platform + * internal/providers/*stack: drop dead timeout code + * stages/disks: improve error reporting for LUKS device reuse + * ignition-setup-user.service: drop Before=multipathd.service + * Dockerfile: build ignition-validate container using Fedora + * workflows: test on Go 1.16 + * tests/*: verify deletion of block device w/o creating a FS + * *: allow erasing block device without creating a filesystem + * *: rename other projects' master branches to main + * *: rename master branch to main + * config/*: add export functions for parsing any config version < N + * config/*: refactor config.go's Parse() to use GetConfigVersion + * config/* : minor cleanup +- Refreshed to match new Ignition spec + * 0002-allow-multiple-mounts-of-same-device.patch + ------------------------------------------------------------------- Wed Jul 7 16:05:49 UTC 2021 - Ignaz Forster diff --git a/ignition.spec b/ignition.spec index 3dd2161..a247198 100644 --- a/ignition.spec +++ b/ignition.spec @@ -17,7 +17,7 @@ Name: ignition -Version: 2.10.1 +Version: 2.11.0 Release: 0 Summary: First boot installer and configuration tool License: Apache-2.0