ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
51 lines
1.4 KiB
Diff
51 lines
1.4 KiB
Diff
From 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Garrett <matthew.garrett@nebula.com>
|
|
Date: Wed, 12 Jun 2013 11:51:49 -0400
|
|
Subject: [PATCH 080/206] Add support for UEFI operating systems returned by
|
|
os-prober
|
|
|
|
os-prober returns UEFI operating systems in the form:
|
|
|
|
path:long-name:name
|
|
|
|
where path is the path under the EFI directory on the ESP. This is in
|
|
contrast to legacy OSes, where path is the device string. Handle this case.
|
|
---
|
|
util/grub.d/30_os-prober.in | 21 ++++++++++++++++++---
|
|
1 file changed, 18 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
|
index 515a68c7aa0..9b8f5968e2d 100644
|
|
--- a/util/grub.d/30_os-prober.in
|
|
+++ b/util/grub.d/30_os-prober.in
|
|
@@ -328,8 +328,23 @@ EOF
|
|
EOF
|
|
;;
|
|
*)
|
|
- # TRANSLATORS: %s is replaced by OS name.
|
|
- gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2
|
|
- ;;
|
|
+ case ${DEVICE} in
|
|
+ *.efi)
|
|
+ cat << EOF
|
|
+menuentry '$(echo "${LONGNAME}" | grub_quote)' {
|
|
+EOF
|
|
+ save_default_entry | grub_add_tab
|
|
+ cat << EOF
|
|
+ chainloader /EFI/${DEVICE}
|
|
+ boot
|
|
+}
|
|
+EOF
|
|
+ ;;
|
|
+ *)
|
|
+ echo -n " "
|
|
+ # TRANSLATORS: %s is replaced by OS name.
|
|
+ gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2
|
|
+ ;;
|
|
+ esac
|
|
esac
|
|
done
|
|
--
|
|
2.15.0
|
|
|