Accepting request 764393 from devel:kubic:ignition

Add 0002-allow-multiple-mounts-of-same-device.patch:
Allows mounting a device multiple times, e.g. to mount several subvolumes from a Btrfs device or bind mounting the device to multiple places, by adding the path to the key. [Workaround for gh#coreos/ignition#890]

OBS-URL: https://build.opensuse.org/request/show/764393
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=10

0002-allow-multiple-mounts-of-same-device.patch

@@ -0,0 +1,21 @@
+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.
+
+diff --git a/config/v3_1_experimental/types/filesystem.go b/config/v3_1_experimental/types/filesystem.go
+index 964dfca..bd301f8 100644
+--- a/config/v3_1_experimental/types/filesystem.go
++++ b/config/v3_1_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{} {

ignition.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jan 14 17:05:19 UTC 2020 - Ignaz Forster <iforster@suse.com>
+
+- Add 0002-allow-multiple-mounts-of-same-device.patch:
+  Allow 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.
+  [Workaround for gh#coreos/ignition#890]
+
 -------------------------------------------------------------------
 Wed Jan  8 17:47:30 UTC 2020 - Ignaz Forster <iforster@suse.com>
 

ignition.spec

@@ -25,6 +25,7 @@ Group:          System/Management
 URL:            https://github.com/coreos/ignition
 Source:         %{name}-%{version}.tar.xz
 Patch1:         0001-Throw-error-if-SSH-keys-could-not-be-written.patch
+Patch2:         0002-allow-multiple-mounts-of-same-device.patch
 Requires:       dracut
 BuildRequires:  dracut
 BuildRequires:  libblkid-devel
@@ -42,6 +43,7 @@ applies the configuration.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build