Ignition 2.4.1

.gitignore

@@ -44,3 +44,5 @@
 /ignition-dracut-bdf0a65.tar.gz
 /ignition-d18bf90.tar.gz
 /ignition-dracut-e75fef0.tar.gz
+/ignition-5260a5b.tar.gz
+/ignition-dracut-6b1d128.tar.gz

0001-files-don-t-relabel-homedir-symlinks-themselves.patch

@@ -1,51 +0,0 @@
-From 6be9319720458c8c52dd0f5b760f5c6449775d14 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Wed, 15 Jul 2020 12:13:12 -0400
-Subject: [PATCH] files: don't relabel homedir symlinks themselves
-
-Regression from #996. If the home directory is a symlink, then just
-relabel the referent, not the symlink itself. Since the symlink already
-existed, we assume that it's properly labeled.
-
-This causes an error on the FCOS live ISO, where `/sysroot` is mounted
-from the squashfs, and so is read-only. But even on non-live, we should
-just assume that whatever created the `/root -> /var/roothome` symlink
-labeled it correctly.
-
-This would normally be a no-op because `setfiles` would see that it's
-properly labeled and not even attempt a `setxattr`. But because we can't
-yet read SELinux labels from the initrd, it thinks it's unlabeled. (That
-will be fixed by https://bugzilla.redhat.com/show_bug.cgi?id=1845210).
----
- internal/exec/stages/files/passwd.go | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go
-index 3ef4b00..7e4263f 100644
---- a/internal/exec/stages/files/passwd.go
-+++ b/internal/exec/stages/files/passwd.go
-@@ -75,15 +75,18 @@ func (s *stage) createPasswd(config types.Config) error {
- 			if err != nil {
- 				return err
- 			}
--			s.relabel(homedir)
- 
- 			// Check if the homedir is actually a symlink, and make sure we
--			// relabel the target too. This is relevant on OSTree-based
--			// platforms, where /root is a link to /var/roothome.
-+			// relabel the target instead in that case. This is relevant on
-+			// OSTree-based platforms, where /root is a link to /var/roothome.
- 			if resolved, err := s.ResolveSymlink(homedir); err != nil {
- 				return err
- 			} else if resolved != "" {
-+				// note we don't relabel the symlink itself; we assume it's
-+				// already properly labeled
- 				s.relabel(resolved)
-+			} else {
-+				s.relabel(homedir)
- 			}
- 		}
- 	}
--- 
-2.26.2
-

ignition.spec

@@ -49,7 +49,7 @@
 # https://github.com/coreos/ignition
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}/v2
-%global commit          d18bf905455ba53c4363d2adbfb1d6777a1be315
+%global commit          5260a5b355e287bbd4f4830d7c13ccbb87bd48b3
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 # define ldflags, buildflags, testflags here. The ldflags were
 # taken from ./build. We will need to periodically check these
@@ -67,21 +67,19 @@
 # https://github.com/coreos/ignition-dracut spec2x branch
 %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo}
 %global dracutimport_path     %{dracutprovider_prefix}
-%global dracutcommit          e75fef0aad283f052d0344884cbaa08025aca5e0
+%global dracutcommit          6b1d128c6ba2d77825d214ada238a4826e420d40
 %global dracutshortcommit     %(c=%{dracutcommit}; echo ${c:0:7})
 
 
 Name:           ignition
-Version:        2.4.0
+Version:        2.4.1
-Release:        2.git%{shortcommit}%{?dist}
+Release:        1.git%{shortcommit}%{?dist}
 Summary:        First boot installer and configuration tool
 License:        ASL 2.0 and BSD
 URL:            https://%{provider_prefix}
 Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 Source1:        https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz
 
-Patch0: 0001-files-don-t-relabel-homedir-symlinks-themselves.patch
-
 %define gopath %{_datadir}/gocode
 ExcludeArch: ppc64
 BuildRequires: golang >= 1.10
@@ -444,7 +442,6 @@ Ignition project's Github releases page.
 # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html
 # unpack source0 and apply patches
 %setup -T -b 0 -q -n %{repo}-%{commit}
-%patch0 -p1
 
 # unpack source1 (dracut modules)
 %setup -T -D -a 1 -q -n %{repo}-%{commit}
@@ -609,6 +606,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %changelog
+* Thu Jul 16 2020 Benjamin Gilbert <bgilbert@redhat.com> - 2.4.1-1.git5260a5b
+- New release
+- Bump ignition-dracut to fix warning in udev rule
+
 * Wed Jul 15 2020 Jonathan Lebon <jonathan@jlebon.com> - 2.4.0-2.gitd18bf90
 - Backport root homedir relabeling fix
   https://github.com/coreos/ignition/pull/1029 for

sources

@@ -1,2 +1,2 @@
-SHA512 (ignition-d18bf90.tar.gz) = 8621fa1ae5ac74f6cb285f8e86efd094a705f3508ac5aeebbf5304c694d28ea823a542d1e44e56fbdc66ebe0b7ce49d521f2dd9cb4695cf485a0dfa533dcca1e
+SHA512 (ignition-5260a5b.tar.gz) = 6e3491fa1a95f1356bec7a04d5d41a4e92416a8776122ae863c152e2297e8ba6519eea6da253dfae37c54d62ae217d74084bd9214a58ed1b4a19fd221a9fbfa9
-SHA512 (ignition-dracut-e75fef0.tar.gz) = 43402225387ac10a70ed36b3fa813d380bc3cc17ba4b4ec16d4f0b50fed84145a0b30bf26610a64181d94934c671b2a85faf861fe5ee964a7e693f89a4677a5a
+SHA512 (ignition-dracut-6b1d128.tar.gz) = 23eb67a8cb03168dca3f21a8a4e16fc1e735bc8d9291ab9a02790d78da41109c6ec68cb4714b56086da9cd7b771aa2899dd85b73948a44b294362e5f497ce877