1d10eb3817
* 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
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
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.
|
|
|
|
Index: ignition-2.4.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 (
|
|
)
|
|
|
|
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_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 (
|
|
)
|
|
|
|
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_3/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 (
|
|
)
|
|
|
|
func (f Filesystem) Key() string {
|
|
- return f.Device
|
|
+ return f.Device + *f.Path
|
|
}
|
|
|
|
func (f Filesystem) IgnoreDuplicates() map[string]struct{} {
|