569fa9e2a7
- Omit ignition module in initrds for already configured systems: * Add 0001-dracut-Don-t-include-the-ignition-module-by-default.patch * Edit module-setup.sh - Add explicit dep on combustion in module-setup.sh - Replace ignition-dracut-grub2 with combustion's firstboot.target: * Add 0001-Order-ignition-disks.service-before-systemd-fsck-roo.patch * Edit ignition-suse-generator * Edit ignition-umount-initrd-fstab.service * Edit module-setup.sh * Drop 02_ignition_firstboot * Drop ignition-firstboot-complete.service * Adjust README.SUSE - Edit ignition-umount-initrd-fstab.service to not rely on combustion units forcing proper order - Add 0003-Move-the-GPT-header-on-resized-disks.patch to make it - Fix patch file metadata in 0001-ignore-missing-qemu-blockdev.patch and 0002-allow-multiple-mounts-of-same-device.patch OBS-URL: https://build.opensuse.org/request/show/1105491 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=111
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
|
|
}
|
|
|