51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
|
From 151b1691fe0cf885df101c6e6a7cb1defc50428b 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 cd543bd..e2b8ab3 100644
|
||
|
|
--- a/util/grub.d/10_linux.in
|
||
|
|
+++ b/util/grub.d/10_linux.in
|
||
|
|
@@ -133,17 +133,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 '$message'
|
||
|
|
+ linuxefi ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
||
|
|
+EOF
|
||
|
|
+ else
|
||
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
||
|
|
echo '$message'
|
||
|
|
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 '$message'
|
||
|
|
+ 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
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|