Enable writing ssh keys fragments on RHEL/CentOS >= 9

https://issues.redhat.com/browse/COS-1589
This commit is contained in:
Christian Glombek 2022-08-09 16:08:58 +02:00
parent 03db1836f4
commit a637ff4bd8

View File

@ -19,7 +19,7 @@ Version: 2.14.0
%global dracutlibdir %{_prefix}/lib/dracut %global dracutlibdir %{_prefix}/lib/dracut
Name: ignition Name: ignition
Release: 4%{?dist} Release: 5%{?dist}
Summary: First boot installer and configuration tool Summary: First boot installer and configuration tool
# Upstream license specification: Apache-2.0 # Upstream license specification: Apache-2.0
@ -249,9 +249,13 @@ engineering and uploaded to the Ignition GitHub releases page.
%build %build
export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true "
%if 0%{?rhel} || 0%{?centos} %if 0%{?rhel} && 0%{?rhel} <= 8
# Disable writing ssh keys fragments on RHEL/CentOS <= 8
LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false '
%endif
%if 0%{?rhel}
# Need uncompressed debug symbols for debuginfo extraction # Need uncompressed debug symbols for debuginfo extraction
LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false -compressdwarf=false ' LDFLAGS+=' -compressdwarf=false '
%endif %endif
export GOFLAGS="-mod=vendor" export GOFLAGS="-mod=vendor"
@ -339,6 +343,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
%endif %endif
%changelog %changelog
* Tue Aug 9 2022 Christian Glombek <cglombek@redhat.com> - 2.14.0-5
- Enable writing ssh keys fragments on RHEL/CentOS >= 9
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-4 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild