Merge mainline into install

util/grub-install.in

@@ -30,7 +30,6 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
-font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 localedir=@datadir@/locale
 
@@ -104,11 +103,6 @@ if [ "${target_cpu}-${platform}" = "i386-ieee1275" ] || [ "${target_cpu}-${platf
     cat <<EOF
   --no-nvram              don't update the boot-device NVRAM variable
 EOF
-fi
-if [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    cat <<EOF
-  --font=FILE             font file to use
-EOF
 fi
     cat <<EOF
 
@@ -154,10 +148,11 @@ do
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
+# Accept and ignore for compatibility
     --font)
-	font=`argument $option "$@"`; shift;;
+        shift;;
     --font=*)
-	font=`echo "$option" | sed 's/--font=//'` ;;
+	;;
 
     --root-directory)
 	rootdir=`argument $option "$@"`; shift;;