Harald Hoyer 460d2c
From 9eb1d1ed5ed1eb5008e6173c1ae0480132a4bea4 Mon Sep 17 00:00:00 2001
Harald Hoyer 460d2c
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 460d2c
Date: Fri, 2 Oct 2020 13:40:00 +0200
Harald Hoyer 460d2c
Subject: [PATCH] dracut.spec: remove fedora pre 30 quirks
Harald Hoyer 460d2c
Harald Hoyer 460d2c
---
Harald Hoyer 460d2c
 dracut.spec | 5 ++---
Harald Hoyer 460d2c
 1 file changed, 2 insertions(+), 3 deletions(-)
Harald Hoyer 460d2c
Harald Hoyer 460d2c
diff --git a/dracut.spec b/dracut.spec
Harald Hoyer 460d2c
index 3597c6e5..fded5f17 100644
Harald Hoyer 460d2c
--- a/dracut.spec
Harald Hoyer 460d2c
+++ b/dracut.spec
Harald Hoyer 460d2c
@@ -279,7 +279,7 @@ rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
Harald Hoyer 460d2c
 echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
Harald Hoyer 460d2c
 echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
Harald Hoyer 460d2c
 
Harald Hoyer 460d2c
-%if 0%{?fedora} <= 30 || 0%{?rhel} <= 8
Harald Hoyer 460d2c
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
Harald Hoyer 460d2c
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
Harald Hoyer 460d2c
 install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
Harald Hoyer 460d2c
 %endif
Harald Hoyer 460d2c
@@ -478,8 +478,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
Harald Hoyer 460d2c
 %files config-rescue
Harald Hoyer 460d2c
 %{dracutlibdir}/dracut.conf.d/02-rescue.conf
Harald Hoyer 460d2c
 %{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
Harald Hoyer 460d2c
-%if 0%{?fedora} <= 30 || 0%{?rhel} <= 8
Harald Hoyer 460d2c
-# FIXME: remove after F30
Harald Hoyer 460d2c
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
Harald Hoyer 460d2c
 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
Harald Hoyer 460d2c
 %endif
Harald Hoyer 460d2c
 
Harald Hoyer 460d2c