|
 |
f96e0b |
From 01d4ed9c65da7fa95ec6c7ef952bc50064db2235 Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Peter Jones <pjones@redhat.com>
|
|
|
f96e0b |
Date: Fri, 25 May 2012 14:57:38 -0400
|
|
|
f96e0b |
Subject: [PATCH 445/482] Don't set boot device on ppc-ieee1275
|
|
|
f96e0b |
|
|
|
f96e0b |
This started with the problem that powerkvm doesn't have /dev/nvram and so
|
|
|
f96e0b |
there is no way to set boot-device.
|
|
|
f96e0b |
---
|
|
|
f96e0b |
util/grub-install.in | 18 ++++++++++--------
|
|
|
f96e0b |
1 file changed, 10 insertions(+), 8 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/util/grub-install.in b/util/grub-install.in
|
|
|
f96e0b |
index 3dbd5da..c8f3a30 100644
|
|
|
f96e0b |
--- a/util/grub-install.in
|
|
|
f96e0b |
+++ b/util/grub-install.in
|
|
|
f96e0b |
@@ -733,14 +733,16 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
|
|
|
f96e0b |
}
|
|
|
f96e0b |
fi
|
|
|
f96e0b |
|
|
|
f96e0b |
- "$nvsetenv" boot-device "$boot_device" || {
|
|
|
f96e0b |
- # TRANSLATORS: The %s will be replaced by an external program name.
|
|
|
f96e0b |
- gettext_printf "\`%s' failed.\n" "$nvsetenv" 1>&2
|
|
|
f96e0b |
- gettext "You will have to set \`boot-device' variable manually. At the IEEE1275 prompt, type:" 1>&2
|
|
|
f96e0b |
- echo 1>&2
|
|
|
f96e0b |
- echo " setenv boot-device $boot_device" 1>&2
|
|
|
f96e0b |
- exit 1
|
|
|
f96e0b |
- }
|
|
|
f96e0b |
+ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]; then
|
|
|
f96e0b |
+ "$nvsetenv" boot-device "$boot_device" || {
|
|
|
f96e0b |
+ # TRANSLATORS: The %s will be replaced by an external program name.
|
|
|
f96e0b |
+ gettext_printf "\`%s' failed.\n" "$nvsetenv" 1>&2
|
|
|
f96e0b |
+ gettext "You will have to set \`boot-device' variable manually. At the IEEE1275 prompt, type:" 1>&2
|
|
|
f96e0b |
+ echo 1>&2
|
|
|
f96e0b |
+ echo " setenv boot-device $boot_device" 1>&2
|
|
|
f96e0b |
+ exit 1
|
|
|
f96e0b |
+ }
|
|
|
f96e0b |
+ fi
|
|
|
f96e0b |
fi
|
|
|
f96e0b |
elif [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = xmips-arc ]; then
|
|
|
f96e0b |
dvhtool -d "${install_device}" --unix-to-vh "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|