commit 78d109819d4e8bd125acdd048ef95875fd399769
author Peter Jones <pjones@redhat.com> Mon Jul 16 18:57:11 2012 -0400
committer Edward Jee <edjee@google.com> Wed Mar 07 22:24:37 2018 +0000
tree e7c4a4a7d6f4329842f303bc3b23af96d144e0b0
parent d7d2451ceb9ad08ad91f22da649dc0e775cc3313

grub-lakitu: REDHAT: MASTER-SB: Use "linuxefi" and "initrdefi" where appropriate.

(cherry picked from commit ecd6ad1851e916227584440987326647e74d5b98)
(from master-sb branch of https://github.com/rhboot/grub2)

BUG=b:69569602
TEST=TBD

Change-Id: Ib77027035d3ca026326fdf9b4b46f009a3b4607a
Reviewed-on: https://chromium-review.googlesource.com/945886
Reviewed-by: Edward Jee <edjee@google.com>
Commit-Queue: Edward Jee <edjee@google.com>
Tested-by: Edward Jee <edjee@google.com>
Trybot-Ready: Edward Jee <edjee@google.com>

grub-lakitu/util/grub.d/10_linux.in

diff --git a/grub-lakitu/util/grub.d/10_linux.in b/grub-lakitu/util/grub.d/10_linux.in
index de9044c..d284930 100644
--- a/grub-lakitu/util/grub.d/10_linux.in
+++ b/grub-lakitu/util/grub.d/10_linux.in
@@ -129,17 +129,31 @@
     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
 }