grub2/0065-util-grub-install.in-Follow-the-symbolic-link-parame.patch
2013-05-02 16:54:52 -04:00

41 lines
1.6 KiB
Diff

From 28e8ed1fc8a89e3d4c71be6b27166b26b4e61570 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Mon, 10 Dec 2012 17:07:01 +0100
Subject: [PATCH 065/364] * util/grub-install.in: Follow the symbolic
link parameter added to the file command.
---
ChangeLog | 5 +++++
util/grub-install.in | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 0b57abf..e522078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-10 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+
+ * util/grub-install.in: Follow the symbolic link parameter added
+ to the file command.
+
2012-12-10 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-install.in: Remove stale TODO.
diff --git a/util/grub-install.in b/util/grub-install.in
index a2cf07a..9dc4e0b 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -748,7 +748,7 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
exit 1
fi
- if [ "$(file -s "${install_device}" -b | awk '{ print $1 }')" = ELF ] || [ x$("${grub_probe}" -m "${device_map}" -d "${install_device}" -t zero_check) = xtrue ]; then
+ if [ "$(file -s -b -L "${install_device}" | awk '{ print $1 }')" = ELF ] || [ x$("${grub_probe}" -m "${device_map}" -d "${install_device}" -t zero_check) = xtrue ]; then
dd if="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" of="${install_device}" status=noxfer || {
gettext "Failed to copy Grub to the PReP partition." 1>&2
echo 1>&2
--
1.8.1.4