|
 |
28ab1c |
From 7c6839180cd616cebaeefd0cb05b60d022388277 Mon Sep 17 00:00:00 2001
|
|
|
28ab1c |
From: Adam Williamson <awilliam@redhat.com>
|
|
|
28ab1c |
Date: Thu, 26 Nov 2020 11:29:45 -0800
|
|
|
28ab1c |
Subject: [PATCH] Drop 51-dracut-rescue-postinst.sh entirely
|
|
|
28ab1c |
|
|
|
28ab1c |
It is only installed on RHEL 8+, but as noted in the first commit
|
|
|
28ab1c |
that tried to do this - 0bb9a683 - we already have branches for
|
|
|
28ab1c |
all RHEL releases, so there's no point keeping such a conditional
|
|
|
28ab1c |
on the master branch. After 0bb9a683, 51-dracut-rescue-postinst.sh
|
|
|
28ab1c |
was re-added because Fedora 30 needed it, with a FIXME saying to
|
|
|
28ab1c |
remove it after F30 was released. But instead of that happening, it
|
|
|
28ab1c |
got changed to a conditional to install it on Fedora <= 30 or RHEL
|
|
|
28ab1c |
<= 8 in 9e68789d and the FIXME was removed, then in 9eb1d1ed that
|
|
|
28ab1c |
conditional was simplified to only refer to RHEL, so we wound up
|
|
|
28ab1c |
with this situation.
|
|
|
28ab1c |
|
|
|
28ab1c |
Note the last two commits were never ported to the RHEL-8 branch,
|
|
|
28ab1c |
so it's broken, I will send a separate PR for that.
|
|
|
28ab1c |
|
|
|
28ab1c |
Signed-off-by: Adam Williamson <awilliam@redhat.com>
|
|
|
28ab1c |
|
|
|
28ab1c |
Cherry-picked from: b3e55bde30b8d34c7ed888794ef3f5e9f028b267
|
|
|
28ab1c |
Resolves: #1771517
|
|
|
28ab1c |
---
|
|
|
28ab1c |
dracut.spec | 10 ----------
|
|
|
28ab1c |
1 file changed, 10 deletions(-)
|
|
|
28ab1c |
|
|
|
28ab1c |
diff --git a/dracut.spec b/dracut.spec
|
|
|
28ab1c |
index dcaafa61..c8783699 100644
|
|
|
28ab1c |
--- a/dracut.spec
|
|
|
28ab1c |
+++ b/dracut.spec
|
|
|
28ab1c |
@@ -277,15 +277,9 @@ rm -f -- $RPM_BUILD_ROOT%{_bindir}/mkinitrd
|
|
|
28ab1c |
rm -f -- $RPM_BUILD_ROOT%{_bindir}/lsinitrd
|
|
|
28ab1c |
%endif
|
|
|
28ab1c |
|
|
|
28ab1c |
-%if 0%{?fedora} || 0%{?rhel}
|
|
|
28ab1c |
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
|
|
|
28ab1c |
echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
|
|
28ab1c |
|
|
|
28ab1c |
-# FIXME: remove after F30
|
|
|
28ab1c |
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
|
|
|
28ab1c |
-install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
|
|
28ab1c |
-%endif
|
|
|
28ab1c |
-
|
|
|
28ab1c |
%files
|
|
|
28ab1c |
%if %{with doc}
|
|
|
28ab1c |
%doc README HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
|
|
|
28ab1c |
@@ -477,11 +471,7 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
|
|
|
28ab1c |
|
|
|
28ab1c |
%files config-rescue
|
|
|
28ab1c |
%{dracutlibdir}/dracut.conf.d/02-rescue.conf
|
|
|
28ab1c |
-%if 0%{?fedora} || 0%{?rhel}
|
|
|
28ab1c |
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
|
|
|
28ab1c |
-# FIXME: remove after F30
|
|
|
28ab1c |
-%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
|
|
|
28ab1c |
-%endif
|
|
|
28ab1c |
|
|
|
28ab1c |
%triggerin network -- dracut-network < 049-83.git20200525
|
|
|
28ab1c |
echo '# Since rhel-8.3 dracut moved to use NetworkManager
|
|
|
28ab1c |
|