Bump to Ignition 0.29.1

.gitignore

@@ -10,3 +10,4 @@
 /ignition-dracut-7ee64ca.tar.gz
 /ignition-dracut-decf63f.tar.gz
 /ignition-dracut-7b83454.tar.gz
+/ignition-b1ab0b2.tar.gz

0001-stages-files-relabel-files-before-systemd-sysctl.patch

@@ -1,35 +0,0 @@
-From bab77f2fa4ecbc1d0428dd6e8a54d34848d78fd1 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Thu, 27 Sep 2018 16:40:24 -0400
-Subject: [PATCH] stages/files: relabel files before systemd-sysctl
-
-This is a workaround for an inherent issue with the current relabeling
-approach (see #635). `systemd-sysctl.service` is definitely one of those
-early services that have a high probability of reading files from `/etc`
-before it's relabeled.
-
-They're both pulled in by `sysinit.target`, but
-`ignition-relabel.service` has an additional `After=local-fs.target`
-which makes it likelier to run later (also see #635 about that). So for
-now, let's just hack around this by making sure `systemd-sysctl` runs
-after us.
----
- internal/exec/stages/files/files.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go
-index 609a0e8..24676bc 100644
---- a/internal/exec/stages/files/files.go
-+++ b/internal/exec/stages/files/files.go
-@@ -138,7 +138,7 @@ func (s *stage) addRelabelUnit(config types.Config) error {
- Description=Relabel files created by Ignition
- DefaultDependencies=no
- After=local-fs.target
--Before=sysinit.target
-+Before=sysinit.target systemd-sysctl.service
- ConditionSecurity=selinux
- ConditionPathExists=/etc/selinux/ignition.relabel
- OnFailure=emergency.target
--- 
-2.17.1
-

0001-stages-files-relabel-var-home-and-var-roothome.patch

@@ -1,50 +0,0 @@
-From 45b75181389d2bc357de524dc32ede787222dedc Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Fri, 14 Sep 2018 15:27:37 -0400
-Subject: [PATCH] stages/files: relabel /var/home and /var/roothome
-
-The behaviour of how `restorecon` handles symlinks changed between RHCOS
-and FCOS. More specifically, `restorecon` will follow symlinks that are
-part of a given path, but not if the target path is a symlink itself.
-On OSTree-based systems, `/home` and `/root` are just symlinks, so the
-newer `restorecon` wasn't actually relabeling anything under there.
-
-Add the real paths to the list of dirs to relabel and add `-i` so that
-it's not a fatal error on non-OSTree-based systems.
-
-Closes: coreos/fedora-coreos-config#2
----
- internal/exec/stages/files/files.go  | 2 +-
- internal/exec/stages/files/passwd.go | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go
-index 077d383..609a0e8 100644
---- a/internal/exec/stages/files/files.go
-+++ b/internal/exec/stages/files/files.go
-@@ -146,7 +146,7 @@ OnFailureJobMode=replace-irreversibly
- 
- [Service]
- Type=oneshot
--ExecStart=` + distro.RestoreconCmd() + ` -0vRf /etc/selinux/ignition.relabel
-+ExecStart=` + distro.RestoreconCmd() + ` -0vRif /etc/selinux/ignition.relabel
- ExecStart=/usr/bin/rm /etc/selinux/ignition.relabel
- RemainAfterExit=yes`,
- 	}
-diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go
-index 2eecd40..1ae0f02 100644
---- a/internal/exec/stages/files/passwd.go
-+++ b/internal/exec/stages/files/passwd.go
-@@ -41,6 +41,9 @@ func (s *stage) createPasswd(config types.Config) error {
- 			"/etc/.pwd.lock",
- 			"/home",
- 			"/root",
-+			// for OSTree-based systems (newer restorecon doesn't follow symlinks)
-+			"/var/home",
-+			"/var/roothome",
- 		)
- 	}
- 
--- 
-2.19.0
-

ignition.spec

@@ -1,8 +1,8 @@
-# Original spec file as generated by:
+# Original spec file for 0.28.0 as generated by:
 #     gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd  --with-extra --with-build -f
 # With:
 #     gofed/gofed:v1.0.1 docker image
-
+# Modified by hand for 0.29.1
 
 # If any of the following macros should be set otherwise,
 # you can wrap any of them with the following conditions:
@@ -49,7 +49,7 @@
 # https://github.com/coreos/ignition
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          f7079129b8651ac51dba14c3af65692bb413c1dd
+%global commit          b1ab0b28d4aa17535b6503b8d97ed81953da20e5
 %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
@@ -72,15 +72,13 @@
 
 
 Name:           ignition
-Version:        0.28.0
+Version:        0.29.1
-Release:        12.git%{shortcommit}%{?dist}
+Release:        1.git%{shortcommit}%{?dist}
 Summary:        First boot installer and configuration tool
 License:        ASL 2.0
 URL:            https://%{provider_prefix}
 Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 
-Patch0: 0001-stages-files-relabel-var-home-and-var-roothome.patch
-Patch1: 0001-stages-files-relabel-files-before-systemd-sysctl.patch
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
 ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
@@ -152,8 +150,8 @@ Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = %{ve
 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = %{version}-294930c1e79c64e7dbe360054274fdad492c8cf5
-Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab
+Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-9002847aa1425fb6ac49077c0a630b3b67e0fbfd
-Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab
+Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = %{version}-9002847aa1425fb6ac49077c0a630b3b67e0fbfd
 Provides: bundled(golang(github.com/pin/tftp/netascii)) = %{version}-9ea92f6b1029bc1bf3072bba195c84bb9b0370e3
 Provides: bundled(golang(github.com/sigma/vmw-guestinfo/rpcvmx)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903
 Provides: bundled(golang(github.com/sigma/vmw-guestinfo/vmcheck)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903
@@ -331,8 +329,6 @@ initramfs on boot.
 # 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
-%patch1 -p1
 
 # unpack source1 (dracut modules)
 %setup -T -D -a 1 -q -n %{repo}-%{commit}
@@ -442,8 +438,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %gotest %{import_path}/config/v2_1/types
 %gotest %{import_path}/config/v2_2
 %gotest %{import_path}/config/v2_2/types
-%gotest %{import_path}/config/v2_3_experimental
+%gotest %{import_path}/config/v2_3
-%gotest %{import_path}/config/v2_3_experimental/types
+%gotest %{import_path}/config/v2_3/types
+%gotest %{import_path}/config/v2_4_experimental
+%gotest %{import_path}/config/v2_4_experimental/types
 %gotest %{import_path}/config/validate
 %gotest %{import_path}/internal/config
 %gotest %{import_path}/internal/exec/stages/files
@@ -476,6 +474,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %changelog
+* Tue Dec 11 2018 Andrew Jeddeloh <andrew.jeddeloh@redhat.com> - 0.29.1-1.gitb1ab0b2
+- New release 0.29.1
+
 * Wed Nov 21 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.28.0-12.gitf707912
 - Rebuild for protobuf 3.6 in rawhide (f30)
 

sources

@@ -1,2 +1,2 @@
-SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b
+SHA512 (ignition-b1ab0b2.tar.gz) = 7723b60f71ba71b937b89b10d27afd244e3cee16da95391928de212983db38be03a5d0f3c641c7de423bb1eabd79e8120add483791d0d23bc3ce96180cfcee65
 SHA512 (ignition-dracut-7b83454.tar.gz) = 8a523998efa1f55de77a7d4fb6a7fa060ebd3632d81e46fba1384fa8645934ae45044d524f25e724d56fe5dbf24424327e1d0bdc8d46c6e95793e92fbbe221f3