Hello community, here is the log from the commit of package ignition for openSUSE:Factory checked in at 2020-01-14 21:11:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ignition (Old) and /work/SRC/openSUSE:Factory/.ignition.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ignition" Tue Jan 14 21:11:21 2020 rev:10 rq:764393 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ignition/ignition.changes 2020-01-09 22:50:30.874706876 +0100 +++ /work/SRC/openSUSE:Factory/.ignition.new.6675/ignition.changes 2020-01-14 21:13:52.950945522 +0100 @@ -1,0 +2,9 @@ +Tue Jan 14 17:05:19 UTC 2020 - Ignaz Forster <ifors...@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] + +------------------------------------------------------------------- New: ---- 0002-allow-multiple-mounts-of-same-device.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ignition.spec ++++++ --- /var/tmp/diff_new_pack.1ZTpUY/_old 2020-01-14 21:13:53.754945889 +0100 +++ /var/tmp/diff_new_pack.1ZTpUY/_new 2020-01-14 21:13:53.758945890 +0100 @@ -25,6 +25,7 @@ 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 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build ++++++ 0002-allow-multiple-mounts-of-same-device.patch ++++++ Author: Ignaz Forster <ifors...@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{} {
