You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.6 KiB
47 lines
1.6 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Peter Jones <pjones@redhat.com> |
|
Date: Mon, 16 Jul 2012 18:57:11 -0400 |
|
Subject: [PATCH] Use "linuxefi" and "initrdefi" where appropriate. |
|
|
|
--- |
|
util/grub.d/10_linux.in | 18 ++++++++++++++++-- |
|
1 file changed, 16 insertions(+), 2 deletions(-) |
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
|
index 00d193159e9..ad34cc02d36 100644 |
|
--- a/util/grub.d/10_linux.in |
|
+++ b/util/grub.d/10_linux.in |
|
@@ -127,17 +127,31 @@ linux_entry () |
|
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" |
|
fi |
|
message="$(gettext_printf "Loading Linux %s ..." ${version})" |
|
- sed "s/^/$submenu_indentation/" << EOF |
|
+ if [ -d /sys/firmware/efi ]; then |
|
+ sed "s/^/$submenu_indentation/" << EOF |
|
+ echo '$(echo "$message" | grub_quote)' |
|
+ linuxefi ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} |
|
+EOF |
|
+ else |
|
+ sed "s/^/$submenu_indentation/" << EOF |
|
echo '$(echo "$message" | grub_quote)' |
|
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} |
|
EOF |
|
+ fi |
|
if test -n "${initrd}" ; then |
|
# TRANSLATORS: ramdisk isn't identifier. Should be translated. |
|
message="$(gettext_printf "Loading initial ramdisk ...")" |
|
- sed "s/^/$submenu_indentation/" << EOF |
|
+ if [ -d /sys/firmware/efi ]; then |
|
+ sed "s/^/$submenu_indentation/" << EOF |
|
echo '$(echo "$message" | grub_quote)' |
|
+ initrdefi ${rel_dirname}/${initrd} |
|
+EOF |
|
+ else |
|
+ sed "s/^/$submenu_indentation/" << EOF |
|
+ echo '$message' |
|
initrd ${rel_dirname}/${initrd} |
|
EOF |
|
+ fi |
|
fi |
|
sed "s/^/$submenu_indentation/" << EOF |
|
}
|
|
|