From 1ba00f299b0d324d7de5dac7a2ecef352f823987 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Tue, 30 Nov 2021 15:04:39 -0500 Subject: [PATCH] 2.13.0 --- .gitignore | 1 + ...ange-the-location-of-Ignition-report.patch | 51 ------------------- ignition.spec | 20 ++++---- sources | 2 +- 4 files changed, 13 insertions(+), 61 deletions(-) delete mode 100644 0001-internal-change-the-location-of-Ignition-report.patch diff --git a/.gitignore b/.gitignore index 8272bd3..a4cd92e 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /ignition-2.10.1.tar.gz /ignition-2.11.0.tar.gz /ignition-2.12.0.tar.gz +/ignition-2.13.0.tar.gz diff --git a/0001-internal-change-the-location-of-Ignition-report.patch b/0001-internal-change-the-location-of-Ignition-report.patch deleted file mode 100644 index c6e4f07..0000000 --- a/0001-internal-change-the-location-of-Ignition-report.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 556bc9404cfff08ea63c2a865bd3586ece7e8e44 Mon Sep 17 00:00:00 2001 -From: Sohan Kunkerkar -Date: Wed, 6 Oct 2021 12:08:54 -0400 -Subject: [PATCH] internal/*: change the location of Ignition report - -Fixes https://github.com/coreos/fedora-coreos-tracker/issues/977 - -This change helps to address the problem of displaying a warning -about running Ignition twice while reprovisioning a bare metal -CoreOS instance with a persistent /var partition. ---- - internal/distro/distro.go | 2 +- - internal/exec/stages/files/filesystemEntries.go | 9 --------- - 2 files changed, 1 insertion(+), 10 deletions(-) - -diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 6438d338..aa51a608 100644 ---- a/internal/distro/distro.go -+++ b/internal/distro/distro.go -@@ -76,7 +76,7 @@ var ( - - // Special file paths in the real root - luksRealRootKeyFilePath = "/etc/luks/" -- resultFilePath = "/var/lib/ignition/result.json" -+ resultFilePath = "/etc/.ignition-result.json" - ) - - func DiskByLabelDir() string { return diskByLabelDir } -diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index 79d628a1..dba163c7 100644 ---- a/internal/exec/stages/files/filesystemEntries.go -+++ b/internal/exec/stages/files/filesystemEntries.go -@@ -199,15 +199,6 @@ func (s *stage) createResultFile() error { - } - contentsUri := dataurl.EncodeBytes(data) - entries := []filesystemEntry{ -- // create containing directory with restrictive permissions -- dirEntry{ -- types.Node{ -- Path: filepath.Dir(path), -- }, -- types.DirectoryEmbedded1{ -- Mode: cutil.IntToPtr(0700), -- }, -- }, - fileEntry{ - types.Node{ - Path: path, --- -2.31.1 - diff --git a/ignition.spec b/ignition.spec index efb50ba..aa9e3b7 100644 --- a/ignition.spec +++ b/ignition.spec @@ -10,7 +10,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.12.0 +Version: 2.13.0 %gometa @@ -19,14 +19,13 @@ Version: 2.12.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Patch0: 0001-internal-change-the-location-of-Ignition-report.patch BuildRequires: libblkid-devel @@ -98,17 +97,17 @@ Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20210407161507.git4ee6c745c8bd +Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20211021162308.gitf1dbbca7bef4 Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0 Provides: bundled(golang(github.com/pin/tftp/netascii)) = 2.1.0 Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.5.1 -Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb +Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 @@ -310,6 +309,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Tue Nov 30 2021 Sohan Kunkerkar - 2.13.0-1 +- New release + * Wed Oct 13 2021 Sohan Kunkerkar - 2.12.0-3 - Move Ignition report to /etc diff --git a/sources b/sources index d8e596a..5799214 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.12.0.tar.gz) = 7bbccd680f52df25cdbdd56ae89a2c4f6e628cc0db21e0c3405fd6d4af640546707b1cb7a9ba0cc4db65bed1ecb3c18afea69001a6be42aabbaba43794e29a6f +SHA512 (ignition-2.13.0.tar.gz) = 8e5a2e2feac002e829f2d5de54596752efef3a42ad393e55a15c0cc50b7ea4c438380cbb82c9ed386721cccea4a579e32960c463a7ec4fc27ac8aa532cf425ca