diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-28 00:37:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-28 00:37:32 +0000 |
| commit | 3f81fd7097ec931ebf6d862622e6d81834483dbb (patch) | |
| tree | e8381bb314f59122a26bd714f1a14993a31ab8ee /sys-boot/os-prober/files/os-prober-40grub-check-grub2.patch | |
| parent | 351bdb27fc041435144b39e022d9830c140ebd3a (diff) | |
sys-boot/os-prober : shamelessly take all the patches from openSUSE Factory to make it work
Diffstat (limited to 'sys-boot/os-prober/files/os-prober-40grub-check-grub2.patch')
| -rw-r--r-- | sys-boot/os-prober/files/os-prober-40grub-check-grub2.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sys-boot/os-prober/files/os-prober-40grub-check-grub2.patch b/sys-boot/os-prober/files/os-prober-40grub-check-grub2.patch new file mode 100644 index 00000000..13bac3dd --- /dev/null +++ b/sys-boot/os-prober/files/os-prober-40grub-check-grub2.patch @@ -0,0 +1,19 @@ +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 |