summarylogtreecommitdiffstats
path: root/os-prober-40grub-check-grub2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'os-prober-40grub-check-grub2.patch')
-rw-r--r--os-prober-40grub-check-grub2.patch19
1 files changed, 0 insertions, 19 deletions
diff --git a/os-prober-40grub-check-grub2.patch b/os-prober-40grub-check-grub2.patch
deleted file mode 100644
index 6df6f3b1af3..00000000000
--- a/os-prober-40grub-check-grub2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Andrei Borzenkov <arvidjaar@gmail.com>
-Subject: Also skip legacy grub if grub2 is found
-
-Check for grub.cfg also in /boot/grub2, not only in /boot/grub.
-Index: os-prober/linux-boot-probes/mounted/x86/40grub
-===================================================================
---- os-prober.orig/linux-boot-probes/mounted/x86/40grub
-+++ os-prober/linux-boot-probes/mounted/x86/40grub
-@@ -95,7 +95,9 @@ fi
-
- if [ "$grubconf" ] && \
- ([ ! -e "$mpoint/boot/grub/grub.cfg" ] || \
-- [ "$mpoint/boot/grub/$grubconf" -nt "$mpoint/boot/grub/grub.cfg" ]); then
-+ [ "$mpoint/boot/grub/$grubconf" -nt "$mpoint/boot/grub/grub.cfg" ]) && \
-+ ([ ! -e "$mpoint/boot/grub2/grub.cfg" ] || \
-+ [ "$mpoint/boot/grub/$grubconf" -nt "$mpoint/boot/grub2/grub.cfg" ]); then
- debug "parsing $grubconf"
- parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub/$grubconf"
- fi