revert factored-logger-efi-fix.patch until grub2 is updated to match

This commit is contained in:
Adam Williamson 2013-07-02 09:35:35 -07:00
parent f5f9525db2
commit e57608be2f

View File

@ -1,6 +1,6 @@
Name: os-prober
Version: 1.58
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Probes disks on the system for installed operating systems
Group: System Environment/Base
@ -23,7 +23,10 @@ Patch8: os-prober-bootpart-name-fix.patch
Patch9: os-prober-mounted-partitions-fix.patch
Patch10: os-prober-factor-out-logger.patch
# To be sent upstream
Patch11: os-prober-factored-logger-efi-fix.patch
# Disabled until grub2-mkconfig is updated to match. See Kamil Paral's
# testing in https://bugzilla.redhat.com/show_bug.cgi?id=873207
# - adamw 2013/07
#Patch11: os-prober-factored-logger-efi-fix.patch
Requires: udev coreutils util-linux
Requires: grep /bin/sed /sbin/modprobe
@ -46,7 +49,7 @@ distributions can be added easily.
%patch8 -p1 -b .bootpart-name-fix
%patch9 -p1 -b .mounted-partitions-fix
%patch10 -p1 -b .factor-out-logger
%patch11 -p1 -b .factor-out-logger-efi-fix
#patch11 -p1 -b .factor-out-logger-efi-fix
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
@ -97,6 +100,9 @@ fi
%{_var}/lib/%{name}
%changelog
* Tue Jul 02 2013 Adam Williamson <awilliam@redhat.com> - 1.58-3
- revert factored-logger-efi-fix.patch until grub2 is updated to match
* Tue Jun 18 2013 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.58-2
- Fix a bug in EFI detection because of redirecting result output