From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 12:45:08 +0000 (+0200)
Subject: Allow install_device to be missing on non-pc and non-sparc
X-Git-Tag: 1.99~485^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14437e800868c847980daad364a31a63029d9e8c;p=thirdparty%2Fgrub.git

Allow install_device to be missing on non-pc and non-sparc
---

diff --git a/util/grub-install.in b/util/grub-install.in
index ecdbfe179..344475b5c 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -83,7 +83,8 @@ fi
 # Usage: usage
 # Print the usage.
 usage () {
-if test "x$install_device" = x && test "${target_cpu}-${platform}" != "mips-yeeloong" && test "${target_cpu}-${platform}" != "i386-ieee1275" && test "${target_cpu}-${platform}" != "powerpc-ieee1275"; then
+if [ "${target_cpu}-${platform}" = "i386-pc" ] \
+    || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]; then
     cat <<EOF
 Usage: $self [OPTION] install_device
 EOF
@@ -261,7 +262,8 @@ done
 # for make_system_path_relative_to_its_root()
 . ${libdir}/grub/grub-mkconfig_lib
 
-if test "x$install_device" = x && test "${target_cpu}-${platform}" != "mips-yeeloong" && test "${target_cpu}-${platform}" != "i386-ieee1275" && test "${target_cpu}-${platform}" != "powerpc-ieee1275"; then
+if test "x$install_device" = x && ([ "${target_cpu}-${platform}" = "i386-pc" ] \
+    || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]); then
     echo "install_device not specified." 1>&2
     usage
     exit 1