Hello community, here is the log from the commit of package ignition for openSUSE:Factory checked in at 2020-01-09 22:50:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ignition (Old) and /work/SRC/openSUSE:Factory/.ignition.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ignition" Thu Jan 9 22:50:24 2020 rev:9 rq:761945 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ignition/ignition.changes 2019-12-23 22:49:13.370107054 +0100 +++ /work/SRC/openSUSE:Factory/.ignition.new.6675/ignition.changes 2020-01-09 22:50:30.874706876 +0100 @@ -1,0 +2,7 @@ +Wed Jan 8 17:47:30 UTC 2020 - Ignaz Forster <ifors...@suse.com> + +- Add 0001-Throw-error-if-SSH-keys-could-not-be-written.patch: + Don't silently ignore if the SSH key could not be written + [boo#1159232] + +------------------------------------------------------------------- New: ---- 0001-Throw-error-if-SSH-keys-could-not-be-written.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ignition.spec ++++++ --- /var/tmp/diff_new_pack.6Ljw7D/_old 2020-01-09 22:50:32.046707462 +0100 +++ /var/tmp/diff_new_pack.6Ljw7D/_new 2020-01-09 22:50:32.046707462 +0100 @@ -1,7 +1,7 @@ # # spec file for package ignition # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,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 Requires: dracut BuildRequires: dracut BuildRequires: libblkid-devel @@ -40,6 +41,7 @@ %prep %setup -q +%patch1 -p1 %build sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build ++++++ 0001-Throw-error-if-SSH-keys-could-not-be-written.patch ++++++ commit 7d5235ce7ab91ec21e50f09295dd40fd59a98005 Author: Ignaz Forster <ifors...@suse.com> Date: Wed Jan 8 17:29:55 2020 +0100 References: [boo#1159232] Upstream: Merged [gh#coreos/ignition#908] Throw error if SSH keys could not be written diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go index 5d961e3..55c378c 100644 --- a/internal/exec/util/passwd.go +++ b/internal/exec/util/passwd.go @@ -173,11 +173,14 @@ func (u Util) AuthorizeSSHKeys(c types.PasswdUser) error { } if distro.WriteAuthorizedKeysFragment() { - writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys.d", "ignition"), []byte(ks)) + err = writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys.d", "ignition"), []byte(ks)) } else { - writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys"), []byte(ks)) + err = writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys"), []byte(ks)) } + if err != nil { + return fmt.Errorf("failed to set SSH key: %v", err) + } return nil }, "adding ssh keys to user %q", c.Name) }
