PR#29: backports from spec2x branches - rpms/ignition

rpms / ignition

#29 backports from spec2x branches

Merged 5 years ago by dustymabe. Opened 5 years ago by dustymabe.

rpms/ dustymabe/ignition dusty into master

Dusty Mabe • 5 years ago

f1fa20f

.gitignore

file modified

		`@@ -16,3 +16,4 @@`
		`/ignition-dracut-2c69925.tar.gz`
		`/ignition-f59a653.tar.gz`
		`/ignition-dracut-0d09097.tar.gz`
		`+ /ignition-dracut-73ec3fc.tar.gz`

0001-stages-files-Also-relabel-subuid-subgid-files.patch

file added

+29

		`@@ -0,0 +1,29 @@`
		`+ From 6e7a0683788906bb7ae21a708d5519481d6d058f Mon Sep 17 00:00:00 2001`
		`+ From: Jonathan Lebon <jonathan@jlebon.com>`
		`+ Date: Wed, 20 Mar 2019 16:14:29 -0400`
		`+ Subject: [PATCH] stages/files: Also relabel subuid/subgid files`
		`+`
		+ Those get touched by `useradd` and so we need relabeling if we added any
		`+ users or groups.`
		`+`
		`+ Closes: #762`
		`+ ---`
		`+ internal/exec/stages/files/passwd.go \| 2 ++`
		`+ 1 file changed, 2 insertions(+)`
		`+`
		`+ diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go`
		`+ index 1ae0f02..58fde2e 100644`
		`+ --- a/internal/exec/stages/files/passwd.go`
		`+ +++ b/internal/exec/stages/files/passwd.go`
		`+ @@ -38,6 +38,8 @@ func (s *stage) createPasswd(config types.Config) error {`
		`+ "/etc/group*",`
		`+ "/etc/shadow*",`
		`+ "/etc/gshadow*",`
		`+ + "/etc/subuid*",`
		`+ + "/etc/subgid*",`
		`+ "/etc/.pwd.lock",`
		`+ "/home",`
		`+ "/root",`
		`+ --`
		`+ 2.20.1`
		`+`

ignition.spec

file modified

+10 -2

		`@@ -67,13 +67,13 @@`
		`# https://github.com/coreos/ignition-dracut spec2x branch`
		`%global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo}`
		`%global dracutimport_path %{dracutprovider_prefix}`
		`- %global dracutcommit 0d09097f8bf9f3b0118d629f85c8f06f1becdc1f`
		`+ %global dracutcommit 73ec3fcbc6b3bc3265586480e2d0ad76a0febb5f`
		`%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7})`


		`Name: ignition`
		`Version: 0.31.0`
		`- Release: 6.git%{shortcommit}%{?dist}`
		`+ Release: 7.git%{shortcommit}%{?dist}`
		`Summary: First boot installer and configuration tool`
		`License: ASL 2.0 and BSD`
		`URL: https://%{provider_prefix}`
		`@@ -81,6 +81,7 @@`
		`Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz`

		`Patch0: 0001-support-coreos.config.-and-ignition.config.patch`
		`+ Patch1: 0001-stages-files-Also-relabel-subuid-subgid-files.patch`

		`# For RHEL7 we'll want to specify gopath and list of arches since there is no`
		`# gopath or go_arches macro. We'll also want to make sure we pull in golang`
		`@@ -337,6 +338,7 @@`
		`# 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}`
		`@@ -495,6 +497,12 @@`
		`%endif`

		`%changelog`
		`+ * Fri Mar 22 2019 Dusty Mabe <dusty@dustymabe.com> - 0.31.0-7.gitf59a653`
		`+ - ignition-dracut: Pull in latest from spec2x branch`
		`+ * grub: support overriding network kcmdline args`
		`+ - ignition: pull in subuid/subgid files patch from spec2x branch`
		`+ * stages/files: Also relabel subuid/subgid files`
		`+`
		`* Wed Mar 20 2019 Michael Nguyen <mnguyen@redhat.com> - 0.31.0-6.gitf59a653`
		`- Backport patch for supporting guestinfo.ignition.config.data`

sources

file modified

+1 -1

		`@@ -1,2 +1,2 @@`
		`SHA512 (ignition-f59a653.tar.gz) = fd198a24536c037c27ab99546e94027b08c3634724324b972828ee48f8ab9e1ba4ec1bd49d6aba6337381754cb30025c5311ab85da17c645eb7503b62e9529ff`
		`- SHA512 (ignition-dracut-0d09097.tar.gz) = 83723c46c147172aa56a08a169814e0f3afd5c244609c8104d72d3999a8a28c6a536584ffaea3522400ef094ca38a559fea986e81f565f4e0b2a258bbe829ff2`
		`+ SHA512 (ignition-dracut-73ec3fc.tar.gz) = 8583f9de45607c57dded4ece4b395e09a39b74b00da573e5915889025e577998239c16935159eb4651f5cbbeb42ae2e3562e826fef501cf9d8199e1faec212f0`

dustymabe commented 5 years ago

ignition-dracut: Pull in latest from spec2x branch
- grub: support overriding network kcmdline args
ignition: pull in subuid/subgid files patch from spec2x branch
- stages/files: Also relabel subuid/subgid files