afaa367f82
clean environments, we don't have caches. Additionally, the way
it is used does not even work and reports:
go: clean -cache cannot be used with package arguments
The error was masked until GO 1.23, as the test wether go
supported caching was checking for go 1.23 formatted output.
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=129
79 lines
2.2 KiB
Diff
79 lines
2.2 KiB
Diff
From: 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.16.2/config/v3_1/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.16.2.orig/config/v3_1/types/filesystem.go
|
|
+++ ignition-2.16.2/config/v3_1/types/filesystem.go
|
|
@@ -23,6 +23,9 @@ import (
|
|
)
|
|
|
|
func (f Filesystem) Key() string {
|
|
+ if (f.Path != nil) {
|
|
+ return f.Device + *f.Path
|
|
+ }
|
|
return f.Device
|
|
}
|
|
|
|
Index: ignition-2.16.2/config/v3_2/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.16.2.orig/config/v3_2/types/filesystem.go
|
|
+++ ignition-2.16.2/config/v3_2/types/filesystem.go
|
|
@@ -23,6 +23,9 @@ import (
|
|
)
|
|
|
|
func (f Filesystem) Key() string {
|
|
+ if (f.Path != nil) {
|
|
+ return f.Device + *f.Path
|
|
+ }
|
|
return f.Device
|
|
}
|
|
|
|
Index: ignition-2.16.2/config/v3_3/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.16.2.orig/config/v3_3/types/filesystem.go
|
|
+++ ignition-2.16.2/config/v3_3/types/filesystem.go
|
|
@@ -23,6 +23,9 @@ import (
|
|
)
|
|
|
|
func (f Filesystem) Key() string {
|
|
+ if (f.Path != nil) {
|
|
+ return f.Device + *f.Path
|
|
+ }
|
|
return f.Device
|
|
}
|
|
|
|
Index: ignition-2.16.2/config/v3_4/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.16.2.orig/config/v3_4/types/filesystem.go
|
|
+++ ignition-2.16.2/config/v3_4/types/filesystem.go
|
|
@@ -23,6 +23,9 @@ import (
|
|
)
|
|
|
|
func (f Filesystem) Key() string {
|
|
+ if (f.Path != nil) {
|
|
+ return f.Device + *f.Path
|
|
+ }
|
|
return f.Device
|
|
}
|
|
|
|
Index: ignition-2.16.2/config/v3_5_experimental/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.16.2.orig/config/v3_5_experimental/types/filesystem.go
|
|
+++ ignition-2.16.2/config/v3_5_experimental/types/filesystem.go
|
|
@@ -23,6 +23,9 @@ import (
|
|
)
|
|
|
|
func (f Filesystem) Key() string {
|
|
+ if (f.Path != nil) {
|
|
+ return f.Device + *f.Path
|
|
+ }
|
|
return f.Device
|
|
}
|
|
|