From d5e3307e9b946f7f8c78585abf4fd9c50743c278 Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Tue, 9 Aug 2022 16:45:24 +0200 Subject: [PATCH] Enable writing ssh keys fragments on RHEL/CentOS >= 9 https://issues.redhat.com/browse/COS-1589 Resolves: rhbz#2117606 --- ignition.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ignition.spec b/ignition.spec index bdae51f..bc257a6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool (RHEL CoreOS only) # Upstream license specification: Apache-2.0 @@ -251,9 +251,13 @@ engineering and uploaded to the Ignition GitHub releases page. %build 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 -LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false -compressdwarf=false ' +LDFLAGS+=' -compressdwarf=false ' %endif export GOFLAGS="-mod=vendor" @@ -338,6 +342,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Tue Aug 9 2022 Christian Glombek - 2.14.0-2 +- Enable writing ssh keys fragments on RHEL/CentOS >= 9 + * Thu May 26 2022 Benjamin Gilbert - 2.14.0-1 - New release - Add ignition-apply symlink