Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/rust-coreos-installer.git#8c35534756265bb7a73e0ae9f04c3fbae3080157
This commit is contained in:
DistroBaker
parent
a2fdddcd59
commit
877baaf0d3
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/coreos-installer-0.5.0.crate
|
||||
/coreos-installer-0.6.0.crate
|
||||
/coreos-installer-0.7.0.crate
|
||||
/coreos-installer-0.7.2.crate
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 3da090aabc57a8837db08566967042585be3762b Mon Sep 17 00:00:00 2001
|
||||
From: Dusty Mabe <dusty@dustymabe.com>
|
||||
Date: Thu, 1 Oct 2020 16:47:40 -0400
|
||||
Subject: [PATCH 1/3] signing-keys: add Fedora 33 key
|
||||
|
||||
---
|
||||
src/signing-keys.asc | 30 ++++++++++++++++++++++++++++++
|
||||
1 file changed, 30 insertions(+)
|
||||
|
||||
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
|
||||
index 4ba94a7..00b8ac2 100644
|
||||
--- a/src/signing-keys.asc
|
||||
+++ b/src/signing-keys.asc
|
||||
@@ -89,3 +89,33 @@ Akz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe
|
||||
oNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw==
|
||||
=QWRO
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
+
|
||||
+-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
+Comment: RPM-GPG-KEY-fedora-33-primary
|
||||
+
|
||||
+mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
|
||||
+bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
|
||||
+kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
|
||||
+Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
|
||||
+QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
|
||||
+2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
|
||||
+UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
|
||||
+oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
|
||||
+rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
|
||||
+6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
|
||||
+EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
|
||||
+tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
|
||||
+cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
|
||||
+CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
|
||||
+P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
|
||||
+7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
|
||||
+AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
|
||||
+2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
|
||||
+GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
|
||||
+EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
|
||||
+fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
|
||||
+66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
|
||||
+Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
|
||||
+Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
|
||||
+=EPL3
|
||||
+-----END PGP PUBLIC KEY BLOCK-----
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From 293db97bfdccccf203725fd6ccae01736947a7a1 Mon Sep 17 00:00:00 2001
|
||||
From: Dusty Mabe <dusty@dustymabe.com>
|
||||
Date: Thu, 1 Oct 2020 16:49:31 -0400
|
||||
Subject: [PATCH 2/3] signing-keys: add Fedora 34 key
|
||||
|
||||
---
|
||||
src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++
|
||||
1 file changed, 31 insertions(+)
|
||||
|
||||
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
|
||||
index 00b8ac2..c28c69a 100644
|
||||
--- a/src/signing-keys.asc
|
||||
+++ b/src/signing-keys.asc
|
||||
@@ -119,3 +119,34 @@ Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
|
||||
Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
|
||||
=EPL3
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
+
|
||||
+-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
+Comment: RPM-GPG-KEY-fedora-34-primary
|
||||
+
|
||||
+mQINBF8sAZIBEADKYvLg/5FdLXcVryAFd7Q8qrJq23R7ebxUT1u48Dc8xrsfYJZq
|
||||
+aMcna/xw47wZNyek4Z6YpzqfmnjR7H8yRH/1hAPi/ixYnA6DVL7O3eGE5lYGJzN3
|
||||
+E2ILTzBOI9o/pavvtOqW9N5WIus8cqSdA921v8YPzr3/BTKgGqC9biOrMA+3sNoe
|
||||
+U4T+dztLg20SyBTr/rBH0eui2p/ipvIRuJvHLTKTubR+yG804yupI69M6qFBDebT
|
||||
+rm+CBmwVyj/DY/92LgvCgYqV/TL5FU4qvtyB6jd8JkEeaz/G7UmDRB5JqzKEu6TB
|
||||
+N3SY7nwLiRpIaXet1TWVW/8UKSB2JvYt1LbZyEO82/QOIXxqvV6h3kuBI21RvURz
|
||||
+VxEjRlvPRGHMZ80OoAQqNPkLnVTcX1eLj2ClbwoXCmXFSm72cCCt1SzcAmlaWh8E
|
||||
+rXSUZfs7XqkBrbphXHZ1e6Vxjt/RyKC5doklfOhbuF8gJ31CPo/kuOjFrHGzOwgi
|
||||
+Llec+GHGMfI/cUOu59qo3W85GHsntvEMk83QLkKjBInEYjZSAajp/lS4QF+SD4pl
|
||||
+Qj6Vc1mMCmci61cXX5CcIl1YxNJZzUfZEZNbUjDajqGzkYJoG9n2yJB0w4OiqsAe
|
||||
+ZCirmUIeDUNeI082epc4RFuV33hByGYY9kRWSyM+aCF6PYVISj4l1o9KcQARAQAB
|
||||
+tDFGZWRvcmEgKDM0KSA8ZmVkb3JhLTM0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
|
||||
+cmc+iQJOBBMBCAA4FiEEjFummQvbJuGfKhqAEWGuaUVxmjkFAl8sAZICGw8FCwkI
|
||||
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQEWGuaUVxmjlVuA//QnMA02tydqwpM7r4
|
||||
+WZ4OvlVqFWHhn3oDaBSwBvn6R1oC0MWbr79nnFDn3tpSkZDUdb7wyArmaF8kG8tI
|
||||
+wit5xD/JAzqRBVa9z2hY3n1SFafU/hp3DwbGIL4vLUv3fRayCgWsGhGp0tZvDC9q
|
||||
+PSvQZ675XpRG4pt/TGJB5gGXw7Jxoae/ffaJeblLLRDlSV/bKJt9sYpdu5InDG2i
|
||||
+yIUHfamtYQtnENKL/bN6w7tU/IEgCHqxPmPRiJ0gTUAi5Yabp1+JHqskE85Hm2QF
|
||||
+xMonX595Ry1yZzCjPGhCPAknJ4BhisXV+E/iV3Jyh8vxbJCo1//ygd1Xz8SkCuu/
|
||||
+I0xPtFcVSIP2ikYpJwR2nwwQlLbQYIGCw/S1LV725oEYm/Z1xQ5zha2hBB+fxSwz
|
||||
+7MHsD2XIHrP8NNwt3ywG3NV/BSSkvSSStGUNcQyGRi3O/x/BEIRtWRxgoNO9o3jE
|
||||
+xtWFq3G5+gKY+wfYz/cTGlsWPDG7Fzx4lNisIGATKtLNqdedl7LASPK93z0XDdnS
|
||||
+kfKF0HrT9rdzIKRu4xWatUVIq/65Gv7nsavdsRAQL/Y0jl6sjjQac/Te5J0fByHY
|
||||
+6tGG1W0UWTd0rzFWitEZI/64/Bs83rGhjJNLqWXItZ5VqLe0TWzuxvRFLfM7oX8r
|
||||
+n5Si4l7NpIJubWPqjPoCoP5lsS8=
|
||||
+=V2FG
|
||||
+-----END PGP PUBLIC KEY BLOCK-----
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
From 802b2f1aa5fdf8af1f296955338279846a31865c Mon Sep 17 00:00:00 2001
|
||||
From: Dusty Mabe <dusty@dustymabe.com>
|
||||
Date: Thu, 1 Oct 2020 16:49:48 -0400
|
||||
Subject: [PATCH 3/3] signing-keys: drop Fedora 31 key
|
||||
|
||||
---
|
||||
src/signing-keys.asc | 31 -------------------------------
|
||||
1 file changed, 31 deletions(-)
|
||||
|
||||
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
|
||||
index c28c69a..7eb5f6c 100644
|
||||
--- a/src/signing-keys.asc
|
||||
+++ b/src/signing-keys.asc
|
||||
@@ -29,37 +29,6 @@ dzdA27UUYjWvx42w9menJwh/0jeQcTecIUd0d0rFcw/c1pvgMMl/Q73yzKgKYw==
|
||||
=zbHE
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
------BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
-Comment: RPM-GPG-KEY-fedora-31-primary
|
||||
-
|
||||
-mQINBFxq3QMBEADUhGfCfP1ijiggBuVbR/pBDSWMC3TWbfC8pt7fhZkYrilzfWUM
|
||||
-fTsikPymSriScONXP6DNyZ5r7tgrIVdVrJvRIqIFRO0mufp9HyfWKDO//Ctyp7OQ
|
||||
-zYw6NVthO/aWpyFfJpj6s4iZsYGqf9gByV8brBB8v8jEsCtVOj1BU3bMbLkMsRI9
|
||||
-+WiLjDYyvopqNBQuIe8ogxSxpYdbUz6+jxzfvhRoBzWdjITd//Gjd90kkrBOMWkO
|
||||
-LTqO133OD1WMT08G5NuQ4KhjYsVvSbBpfdkTcNuP8gBP9LxCQDc+e1eAhZ95g3qk
|
||||
-XLeKEK9j+F+wuG/OrEAxBsscCxXRUB38QH6CFe3UxGoSMnBi+jEhicudo+ItpFOy
|
||||
-7rPaYyRh4Pmu4QHcC83bNjp8NI6zTHrBmVuPqkxMn07GMAQav9ezBXj6umqTX4cU
|
||||
-dsJUavJrJ3u7rT0lhBdiGrQ9zPbL07u2Kn+OXPAC3dKSf7G8TvwNAdry9esGSpi3
|
||||
-8aa1myQYVZvAlsIBkbN3fb1wvDJE5czVhzwQ77V2t66jxeg0o9/2OZVH3CozD2Zj
|
||||
-v28LHuW/jnQHtsQ0fUyQYRmHxNEVkW10GGM7fQwxzpxFFS1O/2XEnfMu7yBHZsgL
|
||||
-SojfUct0FhLhEN/g/IINX9ZCVrzK5/De27CNjYE1cgYD/lTmQ0SyjfKVwwARAQAB
|
||||
-tDFGZWRvcmEgKDMxKSA8ZmVkb3JhLTMxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
|
||||
-cmc+iQI+BBMBAgAoAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCXGrkTQUJ
|
||||
-Es8P/QAKCRBQyzkLPDNZxBmDD/90IFwAfFcQq5ENl7/o2CYQ9k2adTHbV5RoIOWC
|
||||
-/o9I5/btn1y8WDhPOUNmsgbUqRqz6srlVplg+LkpIj67PVLDBwpVbCJC8o1fztd2
|
||||
-MryVqdvu562WVhUorII+iW7nfqD0yv55nH9b/JR1qloUa8LpeKw84JgvxF5wVfyR
|
||||
-id1WjI0DBk2taFR4xCfU5Tb262fbdFj5iB9xskP7oNeS29+SfDjlnybtlFoqr9UA
|
||||
-nY1uvhBPkGmj45SJkpfP+L+kGYXVaUd29M/q/Pt46X1KDvr6Z0l8bSUEk3zfcNdj
|
||||
-uEhtHBqSy1UPPAikGX1Q5wGdu7R7+mv/ARqfI6OC44ipoOMNK1Aiu6+slbPYphwX
|
||||
-ighSz9yYuG0EdWt7akfKR0R04Kuej4LXLWcxTR4l8XDzThYgPP0g+z0XQJrAkVhi
|
||||
-SrzICeC3K1GPSiUtNAxSTL+qWWgwvQyAPNoPV/OYmY+wUxUnKCZpEWPkL79lh6CM
|
||||
-bJx/zlrOMzRumSzaOnKW9AOliviH4Rj89OmDifBEsQ0CewdHN9ly6g4ZFJJGYXJ5
|
||||
-HTb5jdButTC3tDfvH8Z7dtXKdC4iqJCIxj698Xn8UjVefZQ2nbv5eXcZLfHtvbNB
|
||||
-TTv1vvBV4G7aiHKYRSj7HmxhLBZC8Y/nmFAemOoOYDpR5eUmPmSbFayoLfRsFXmC
|
||||
-HLs7cw==
|
||||
-=6hRW
|
||||
------END PGP PUBLIC KEY BLOCK-----
|
||||
-
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Comment: RPM-GPG-KEY-fedora-32-primary
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From 139c2db6083d7b5324ec7c06172a3941b8c2d59b Mon Sep 17 00:00:00 2001
|
||||
From: Dusty Mabe <dusty@dustymabe.com>
|
||||
Date: Tue, 6 Oct 2020 17:28:05 -0400
|
||||
Subject: [PATCH] systemd: start coreos-installer service after
|
||||
systemd-resolved
|
||||
|
||||
If the system is configured to use systemd-resolved (i.e.
|
||||
systemd-resolved is enabled) then start coreos-installer after
|
||||
systemd-resolved. Otherwise we get race conditions where
|
||||
coreos-installer starts before resolved is up and we get errors like:
|
||||
|
||||
```
|
||||
Starting Network Name Resolution...
|
||||
[ OK ] Finished Network Manager Wait Online.
|
||||
[ OK ] Reached target Network is Online.
|
||||
Starting CoreOS Installer...
|
||||
[ 12.949935] coreos-installer-service[889]: coreos-installer install /dev/sda --ignition-url https://dustymabe.fedorapeople.org/user-systemd.ign --insecure-ignition
|
||||
[ 13.007728] coreos-installer-service[907]: Error: parsing arguments
|
||||
[ 13.008549] coreos-installer-service[907]: Caused by: downloading source Ignition config https://dustymabe.fedorapeople.org/user-systemd.ign
|
||||
[ 13.009746] coreos-installer-service[907]: Caused by: sending request for 'https://dustymabe.fedorapeople.org/user-systemd.ign' [ 13.011136] coreos-installer-service[907]: Caused by: error sending request for url (https://dustymabe.fedorapeople.org/user-systemd.ign): error trying to connect: dns error: failed to lookup address information: Temporary failure in
|
||||
name resolution [ 13.013407] coreos-installer-service[907]: Caused by: error trying to connect: dns error: failed to lookup address information: Temporary failure in name resolution
|
||||
[ 13.015006] coreos-installer-service[907]: Caused by: dns error: failed to lookup address information: Temporary failure in name resolution
|
||||
[ 13.016399] coreos-installer-service[907]: Caused by: failed to lookup address information: Temporary failure in name resolution
|
||||
[FAILED] Failed to start CoreOS Installer.
|
||||
```
|
||||
---
|
||||
systemd/coreos-installer.service | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/systemd/coreos-installer.service b/systemd/coreos-installer.service
|
||||
index 0a38fd5..bf99df0 100644
|
||||
--- a/systemd/coreos-installer.service
|
||||
+++ b/systemd/coreos-installer.service
|
||||
@@ -3,6 +3,7 @@ Description=CoreOS Installer
|
||||
Before=coreos-installer.target
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
+After=systemd-resolved.service
|
||||
ConditionKernelCommandLine=coreos.inst.install_dev
|
||||
OnFailure=emergency.target
|
||||
OnFailureJobMode=replace-irreversibly
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@ -7,8 +7,8 @@
|
||||
%global crate coreos-installer
|
||||
|
||||
Name: rust-%{crate}
|
||||
Version: 0.7.0
|
||||
Release: 4%{?dist}
|
||||
Version: 0.7.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Installer for Fedora CoreOS and RHEL CoreOS
|
||||
|
||||
# Upstream license specification: Apache-2.0
|
||||
@ -16,10 +16,6 @@ License: ASL 2.0
|
||||
URL: https://crates.io/crates/coreos-installer
|
||||
Source: %{crates_source}
|
||||
|
||||
Patch0: 0001-signing-keys-add-Fedora-33-key.patch
|
||||
Patch1: 0002-signing-keys-add-Fedora-34-key.patch
|
||||
Patch2: 0003-signing-keys-drop-Fedora-31-key.patch
|
||||
Patch3: 0004-systemd-start-coreos-installer-service-after-systemd.patch
|
||||
|
||||
ExclusiveArch: %{rust_arches}
|
||||
|
||||
@ -118,6 +114,9 @@ RHEL CoreOS. It is not needed on other platforms.
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Oct 22 2020 Sohan Kunkerkar <skunkerk@redhat.com> - 0.7.2-1
|
||||
- New release
|
||||
|
||||
* Tue Oct 06 2020 Dusty Mabe <dusty@dustymabe.com> - 0.7.0-4
|
||||
- Backport commit to start coreos-installer service after systemd-resolved
|
||||
- https://github.com/coreos/coreos-installer/pull/389
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (coreos-installer-0.7.0.crate) = 360618bc909398ae951ec18eac1c986c4078064f6c5164ec450b0b26feafb8abb6966a33957486c75116b44f97e1ee0d433d8d38ad53bce218e782682701cc81
|
||||
SHA512 (coreos-installer-0.7.2.crate) = c02ca70f1f4633893cf99507b2ec1e8c7df5d1d44fa7a5137dd5bf0598562e29b924c59b6768ed21db26dba625fae797e2697b4fca036defc41bcf2825abb5c8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user