forked from pool/ignition
b2b2dbf985
* news: add notes for 2.3.0 * config/v3_2_experimental: update all copyright dates * doc/configuration-*: update for new spec * tests: stabilize spec 3.1.0 * *: update for new experimental spec * config/v3_2_experimental: set up package * config/v3_2_experimental: copy from config/v3_1 * config/v3_1_experimental: mark stable * doc/development: update spec stabilization instructions * config: rename function for clarity * tests: bump invalid 2.x experimental version to match spec2x branch * config/v3_1_experimental: add some missing version tests * config/v3_1/translate: fix package name * doc/migrating-configs: update for 3.1.0 * resource/url: allow compression in data URLs * doc/migrating-configs: mention spec 2.4.0 * validate: accept any supported config version * exec: drop validate.go * doc/migrating-configs: put newest version first * Add SHA-256 reference in the docs * Add SHA-256 support for file verification * ci: run blackbox tests in CoreOS CI * Send ssh_authorized keys info into the journald log * Update go-systemd with the systemd module * Send a message to the systemd journal if a user config is provided * tests: add positive tests for resource compression * spec: unify resource fetching type * doc: clarify wording of files.*.verification.hash * vendor: refresh after gomod changes * gomod: update to go-systemd v22 * stages: fix package names * providers/packet: override Accept header fetching instance metadata * resource/url: allow caller-specified headers to override defaults * Allow to specify HTTP headers for fetching configs and files OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=47
35 lines
1.2 KiB
Diff
35 lines
1.2 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_experimental/types/filesystem.go
|
|
===================================================================
|
|
--- ignition-2.3.0.orig/config/v3_2_experimental/types/filesystem.go
|
|
+++ ignition-2.3.0/config/v3_2_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{} {
|