forked from pool/ignition
46b5a9f643
* 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
48 lines
1.6 KiB
Diff
48 lines
1.6 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.3.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
|
|
@@ -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.3.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
|
|
@@ -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.3.0/config/v3_3_experimental/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
|
|
@@ -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{} {
|