Skip to content

Commit

Permalink
Drop 51-dracut-rescue-postinst.sh entirely
Browse files Browse the repository at this point in the history
It is only installed on RHEL 8+, but as noted in the first commit
that tried to do this - 0bb9a68 - we already have branches for
all RHEL releases, so there's no point keeping such a conditional
on the master branch. After 0bb9a68, 51-dracut-rescue-postinst.sh
was re-added because Fedora 30 needed it, with a FIXME saying to
remove it after F30 was released. But instead of that happening, it
got changed to a conditional to install it on Fedora <= 30 or RHEL
<= 8 in 9e68789 and the FIXME was removed, then in 9eb1d1e that
conditional was simplified to only refer to RHEL, so we wound up
with this situation.

Note the last two commits were never ported to the RHEL-8 branch,
so it's broken, I will send a separate PR for that.

Signed-off-by: Adam Williamson <[email protected]>
  • Loading branch information
AdamWill authored and haraldh committed Dec 14, 2020
1 parent 8cceee8 commit b3e55bd
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 76 deletions.
68 changes: 0 additions & 68 deletions 51-dracut-rescue-postinst.sh

This file was deleted.

8 changes: 0 additions & 8 deletions dracut.spec
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,6 @@ rm -f -- $RPM_BUILD_ROOT%{_mandir}/man1/lsinitrd.1*
echo 'hostonly="no"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-generic-image.conf
echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/02-rescue.conf

%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d
install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
%endif

%files
%if %{with doc}
%doc README.md HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
Expand Down Expand Up @@ -479,8 +474,5 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%files config-rescue
%{dracutlibdir}/dracut.conf.d/02-rescue.conf
%{_prefix}/lib/kernel/install.d/51-dracut-rescue.install
%if 0%{?rhel} > 0 && 0%{?rhel} <= 8
%{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
%endif

%changelog

0 comments on commit b3e55bd

Please sign in to comment.