34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
diff -Nru os-prober-1.61.orig/common.sh os-prober-1.61/common.sh
|
|
--- os-prober-1.61.orig/common.sh 2012-03-27 16:40:21.000000000 +0200
|
|
+++ os-prober-1.61/common.sh 2013-06-11 17:50:55.462903518 +0200
|
|
@@ -1,3 +1,5 @@
|
|
+. /etc/sysconfig/grub
|
|
+
|
|
newns () {
|
|
[ "$OS_PROBER_NEWNS" ] || exec /usr/lib/os-prober/newns "$0" "$@"
|
|
}
|
|
diff -Nru os-prober-1.61.orig/os-probes/mounted/x86/05efi os-prober-1.61/os-probes/mounted/x86/05efi
|
|
--- os-prober-1.61.orig/os-probes/mounted/x86/05efi 2013-05-17 14:01:45.000000000 +0200
|
|
+++ os-prober-1.61/os-probes/mounted/x86/05efi 2013-06-11 17:51:09.340827559 +0200
|
|
@@ -8,7 +8,7 @@
|
|
type="$3"
|
|
|
|
# This file is for UEFI platform only
|
|
-if [ ! -d /sys/firmware/efi ]; then
|
|
+if [ ! -d /sys/firmware/efi -a ! "$GRUB_INSTALL_DEVICE_EFI" ]; then
|
|
debug "Not on UEFI platform"
|
|
exit 1
|
|
fi
|
|
diff -Nru os-prober-1.61.orig/os-probes/mounted/x86/20microsoft os-prober-1.61/os-probes/mounted/x86/20microsoft
|
|
--- os-prober-1.61.orig/os-probes/mounted/x86/20microsoft 2013-05-14 22:05:55.000000000 +0200
|
|
+++ os-prober-1.61/os-probes/mounted/x86/20microsoft 2013-06-11 17:51:13.914802216 +0200
|
|
@@ -8,7 +8,7 @@
|
|
type="$3"
|
|
|
|
# This script looks for legacy BIOS bootloaders only. Skip if running UEFI
|
|
-if [ -d /sys/firmware/efi ]; then
|
|
+if [ -d /sys/firmware/efi -o "$GRUB_INSTALL_DEVICE_EFI" ]; then
|
|
debug "Skipping legacy bootloaders on UEFI system"
|
|
exit 1
|
|
fi
|