pool/ignition
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ffbbee0c73
ignition/0002-allow-multiple-mounts-of-same-device.patch

61 lines
2.0 KiB
Diff
Raw Normal View History

- Add 0002-allow-multiple-mounts-of-same-device.patch: Allow mounting a device multiple times, 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. [Workaround for gh#coreos/ignition#890] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=38
2020-01-14 18:10:41 +01:00
Author: Ignaz Forster <iforster@suse.com>
Date: Wed Jan 14 17:57:52 2020 +0100
Upstream: Ticket opened [gh#coreos/ignition#890]
Implement poor man's solution for mounting a device multiple times,
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.
- 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 * ... - Refreshed to match new Ignition spec * 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=74
2021-07-07 19:06:33 +02:00
Index: ignition-2.4.0/config/v3_1/types/filesystem.go
- Update to version 2.3.0: * news: add notes for 2.3.0 * config/v3_2_experimental: update all copyright dates * doc/configuration-*: update for new spec * tests: stabilize spec 3.1.0 * *: update for new experimental spec * config/v3_2_experimental: set up package * config/v3_2_experimental: copy from config/v3_1 * config/v3_1_experimental: mark stable * doc/development: update spec stabilization instructions * config: rename function for clarity * tests: bump invalid 2.x experimental version to match spec2x branch * config/v3_1_experimental: add some missing version tests * config/v3_1/translate: fix package name * doc/migrating-configs: update for 3.1.0 * resource/url: allow compression in data URLs * doc/migrating-configs: mention spec 2.4.0 * validate: accept any supported config version * exec: drop validate.go * doc/migrating-configs: put newest version first * Add SHA-256 reference in the docs * Add SHA-256 support for file verification * ci: run blackbox tests in CoreOS CI * Send ssh_authorized keys info into the journald log * Update go-systemd with the systemd module * Send a message to the systemd journal if a user config is provided * tests: add positive tests for resource compression * spec: unify resource fetching type * doc: clarify wording of files.*.verification.hash * vendor: refresh after gomod changes * gomod: update to go-systemd v22 * stages: fix package names * providers/packet: override Accept header fetching instance metadata * resource/url: allow caller-specified headers to override defaults * Allow to specify HTTP headers for fetching configs and files OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=47
2020-05-11 10:52:22 +02:00
===================================================================
- 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 * ... - Refreshed to match new Ignition spec * 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=74
2021-07-07 19:06:33 +02:00
--- ignition-2.4.0.orig/config/v3_1/types/filesystem.go
+++ ignition-2.4.0/config/v3_1/types/filesystem.go
- Update to version 2.3.0: * news: add notes for 2.3.0 * config/v3_2_experimental: update all copyright dates * doc/configuration-*: update for new spec * tests: stabilize spec 3.1.0 * *: update for new experimental spec * config/v3_2_experimental: set up package * config/v3_2_experimental: copy from config/v3_1 * config/v3_1_experimental: mark stable * doc/development: update spec stabilization instructions * config: rename function for clarity * tests: bump invalid 2.x experimental version to match spec2x branch * config/v3_1_experimental: add some missing version tests * config/v3_1/translate: fix package name * doc/migrating-configs: update for 3.1.0 * resource/url: allow compression in data URLs * doc/migrating-configs: mention spec 2.4.0 * validate: accept any supported config version * exec: drop validate.go * doc/migrating-configs: put newest version first * Add SHA-256 reference in the docs * Add SHA-256 support for file verification * ci: run blackbox tests in CoreOS CI * Send ssh_authorized keys info into the journald log * Update go-systemd with the systemd module * Send a message to the systemd journal if a user config is provided * tests: add positive tests for resource compression * spec: unify resource fetching type * doc: clarify wording of files.*.verification.hash * vendor: refresh after gomod changes * gomod: update to go-systemd v22 * stages: fix package names * providers/packet: override Accept header fetching instance metadata * resource/url: allow caller-specified headers to override defaults * Allow to specify HTTP headers for fetching configs and files OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=47
2020-05-11 10:52:22 +02:00
@@ -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{} {
- 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 * ... - Refreshed to match new Ignition spec * 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=74
2021-07-07 19:06:33 +02:00
Index: ignition-2.4.0/config/v3_2/types/filesystem.go
- Update to version 2.3.0: * news: add notes for 2.3.0 * config/v3_2_experimental: update all copyright dates * doc/configuration-*: update for new spec * tests: stabilize spec 3.1.0 * *: update for new experimental spec * config/v3_2_experimental: set up package * config/v3_2_experimental: copy from config/v3_1 * config/v3_1_experimental: mark stable * doc/development: update spec stabilization instructions * config: rename function for clarity * tests: bump invalid 2.x experimental version to match spec2x branch * config/v3_1_experimental: add some missing version tests * config/v3_1/translate: fix package name * doc/migrating-configs: update for 3.1.0 * resource/url: allow compression in data URLs * doc/migrating-configs: mention spec 2.4.0 * validate: accept any supported config version * exec: drop validate.go * doc/migrating-configs: put newest version first * Add SHA-256 reference in the docs * Add SHA-256 support for file verification * ci: run blackbox tests in CoreOS CI * Send ssh_authorized keys info into the journald log * Update go-systemd with the systemd module * Send a message to the systemd journal if a user config is provided * tests: add positive tests for resource compression * spec: unify resource fetching type * doc: clarify wording of files.*.verification.hash * vendor: refresh after gomod changes * gomod: update to go-systemd v22 * stages: fix package names * providers/packet: override Accept header fetching instance metadata * resource/url: allow caller-specified headers to override defaults * Allow to specify HTTP headers for fetching configs and files OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=47
2020-05-11 10:52:22 +02:00
===================================================================
- 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 * ... - Refreshed to match new Ignition spec * 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=74
2021-07-07 19:06:33 +02:00
--- ignition-2.4.0.orig/config/v3_2/types/filesystem.go
+++ ignition-2.4.0/config/v3_2/types/filesystem.go
- Update to version 2.7.0: * Lots of things too long for this message - Remove upstreamed patches * 0001-fix-install-permissions.patch * 0003-fix-i386-build.patch * ignition-fix-arm32-installation.patch - Refreshed to match new Ignition spec OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=66
2020-10-19 21:20:01 +02:00
@@ -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{} {
- 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 * ... - Refreshed to match new Ignition spec * 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=74
2021-07-07 19:06:33 +02:00
Index: ignition-2.4.0/config/v3_3/types/filesystem.go
- Update to version 2.7.0: * Lots of things too long for this message - Remove upstreamed patches * 0001-fix-install-permissions.patch * 0003-fix-i386-build.patch * ignition-fix-arm32-installation.patch - Refreshed to match new Ignition spec OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=66
2020-10-19 21:20:01 +02:00
===================================================================
- 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 * ... - Refreshed to match new Ignition spec * 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=74
2021-07-07 19:06:33 +02:00
--- 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
- Add 0002-allow-multiple-mounts-of-same-device.patch: Allow mounting a device multiple times, 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. [Workaround for gh#coreos/ignition#890] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=38
2020-01-14 18:10:41 +01:00
@@ -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{} {
Reference in New Issue Copy Permalink