69f59feb61
* Features
* Support partitioning disk with mounted partitions
* Support Proxmox VE
* Support gzipped Akamai user_data
* Changes
* The Dracut module now installs partx
* Mark the 3.5.0 config spec as stable
* No longer accept configs with version 3.5.0-experimental
* Create new 3.6.0-experimental config spec from 3.5.0
* Bug fixes
* Fix network race when phoning home on Equinix Metal
* Fix Akamai Ignition base64 decoding on padded payloads
* Fix Makefile GOARCH for loongarch64 (#1942)
- Drop go build bugfix again, fixed upstream
- Adapting 0002-allow-multiple-mounts-of-same-device.patch to new
3.6.0 spec
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=131
93 lines
2.6 KiB
Diff
93 lines
2.6 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.20.0/config/v3_1/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.20.0.orig/config/v3_1/types/filesystem.go
|
|
+++ ignition-2.20.0/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.20.0/config/v3_2/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.20.0.orig/config/v3_2/types/filesystem.go
|
|
+++ ignition-2.20.0/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.20.0/config/v3_3/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.20.0.orig/config/v3_3/types/filesystem.go
|
|
+++ ignition-2.20.0/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.20.0/config/v3_4/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.20.0.orig/config/v3_4/types/filesystem.go
|
|
+++ ignition-2.20.0/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.20.0/config/v3_5/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.20.0.orig/config/v3_5/types/filesystem.go
|
|
+++ ignition-2.20.0/config/v3_5/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.20.0/config/v3_6_experimental/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.20.0.orig/config/v3_6_experimental/types/filesystem.go
|
|
+++ ignition-2.20.0/config/v3_6_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
|
|
}
|
|
|