Ignition 2.2.1
This commit is contained in:
Benjamin Gilbert
parent
1b6d133ca1
commit
6ab21c400a
2
.gitignore
vendored
2
.gitignore
vendored
@ -33,3 +33,5 @@
|
||||
/ignition-a8f91fa.tar.gz
|
||||
/ignition-dracut-736459e.tar.gz
|
||||
/ignition-dracut-14808e2.tar.gz
|
||||
/ignition-2d3ff58.tar.gz
|
||||
/ignition-dracut-f67d587.tar.gz
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 5028460bba73b7580cb9198474358cb65afcbe0e Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Lebon <jonathan@jlebon.com>
|
||||
Date: Thu, 19 Dec 2019 16:21:19 -0500
|
||||
Subject: [PATCH] stages/files: don't relabel /home and /root symlinks
|
||||
|
||||
On OSTree systems, those are just symlinks in the deployment root. If
|
||||
they're not labeled correctly already, it signals an issue with the disk
|
||||
creation process itself (and might also signal that the next time a
|
||||
deployment root is created, it'll also be mislabeled).
|
||||
|
||||
Anyway, even on non-OSTree systems, it seems reasonable to expect that
|
||||
`/home` and `/root` at least already exist and don't need to be created
|
||||
(and thus don't need to be relabeld).
|
||||
|
||||
It's possible that [fixing `getxattr` without a policy
|
||||
loaded](https://github.com/coreos/fedora-coreos-config/pull/245#issuecomment-560578750)
|
||||
would also fix this, since `setfiles` would see that the symlinks were
|
||||
already correctly labeled.
|
||||
|
||||
In effect, this is completing what #632 started.
|
||||
|
||||
Closes: https://github.com/coreos/fedora-coreos-tracker/issues/339
|
||||
---
|
||||
internal/exec/stages/files/passwd.go | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go
|
||||
index 8ba6cb1..c3d4737 100644
|
||||
--- a/internal/exec/stages/files/passwd.go
|
||||
+++ b/internal/exec/stages/files/passwd.go
|
||||
@@ -68,9 +68,7 @@ func (s *stage) createPasswd(config types.Config) error {
|
||||
s.relabel(deglobbed...)
|
||||
s.relabel(
|
||||
"/etc/.pwd.lock",
|
||||
- "/home",
|
||||
- "/root",
|
||||
- // for OSTree-based systems (newer restorecon doesn't follow symlinks)
|
||||
+ // for OSTree-based systems
|
||||
"/var/home",
|
||||
"/var/roothome",
|
||||
)
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -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 40c0b57b7606bd23210059c5554f151776a1d64b
|
||||
%global commit 2d3ff5862dc9c1dd0cc78e797f42a19964ac1f4c
|
||||
%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 14808e25d77681d252cd0bac18803cce51758a93
|
||||
%global dracutcommit f67d5876b48652ab09b36d57d51d9f57f1a863b1
|
||||
%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7})
|
||||
|
||||
|
||||
Name: ignition
|
||||
Version: 2.1.1
|
||||
Release: 6.git%{shortcommit}%{?dist}
|
||||
Version: 2.2.1
|
||||
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-stages-files-don-t-relabel-home-and-root-symlinks.patch
|
||||
|
||||
%define gopath %{_datadir}/gocode
|
||||
ExcludeArch: ppc64
|
||||
BuildRequires: golang >= 1.10
|
||||
@ -174,6 +172,7 @@ Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-2019052920134
|
||||
Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20190529201340.git22b159166068
|
||||
Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20190529201340.git22b159166068
|
||||
Provides: bundled(golang(github.com/godbus/dbus)) = 0.0.0-20181025153459.git66d97aec3384
|
||||
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
|
||||
@ -187,6 +186,7 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170
|
||||
Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714
|
||||
Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20190228165749.git92fc7df08ae7
|
||||
Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20190228165749.git92fc7df08ae7
|
||||
Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20191110163157.gitd32e6e3b99c4
|
||||
Provides: bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0
|
||||
Provides: bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0
|
||||
Provides: bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0
|
||||
@ -376,7 +376,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}
|
||||
@ -541,6 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Mar 24 2020 Benjamin Gilbert <bgilbert@redhat.com> - 2.2.1-1.git2d3ff58
|
||||
- New release
|
||||
- Bump ignition-dracut for initramfs network teardown
|
||||
|
||||
* Sat Feb 01 2020 Benjamin Gilbert <bgilbert@redhat.com> - 2.1.1-6.git40c0b57
|
||||
- Switch -validate-nonlinux to noarch; move files to /usr/share/ignition
|
||||
- Improve -validate-nonlinux descriptive text
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (ignition-dracut-14808e2.tar.gz) = 9376730777a4859d1d60f99aacd59bbcb0c8194cf120bea40015a0d8451946ddcf5c7ec2043227c0c57a0e4f8c89445f20656ab2de6bc03f07f8bf8fea3a7df3
|
||||
SHA512 (ignition-40c0b57.tar.gz) = aeb195281378c2f531c442214cb4fe735e4ac91d5cd9ac1ae0b9f41ea7d9b5d78a9be85d77399152c863ebf8ad246d53753153eee6ebf1d9aae80fc6f65299d9
|
||||
SHA512 (ignition-2d3ff58.tar.gz) = 116450e0a4afb8a38fa0c0e925f7ee56ec6bab42b43cc5e314c882d74d44065be35bbf224cd45177ae788eb4be98181c0c19b3987a488d5d8ad6048e952ecbd1
|
||||
SHA512 (ignition-dracut-f67d587.tar.gz) = 5cc95dd665b211316217c864f0e9fad921c6a7cfd621ee5ee77a922d59b9207e9ab80340f7aa862aec393e2e8537002f91540beea20558f8c6654e618c8821f0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user