merge mainline into ahci

util/grub-install.in

@@ -656,7 +656,7 @@ elif [ x"$platform" = xefi ]; then
 	    efidir_disk="$(echo "$clean_devmap" | grep "^$(echo "$efidir_drive" | sed 's/,[^)]*//')" | cut -f2)"
 	    efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; s/[^0-9].*//')"
 	    efibootmgr $efi_quiet -c -d "$efidir_disk" -p "$efidir_part" -w \
-		-L "$GRUB_DISTRIBUTOR" -l "\\EFI\\$efi_distributor\\$efi_file"
+		-L "$bootloader_id" -l "\\EFI\\$efi_distributor\\$efi_file"
 	fi
     fi
 fi

util/grub-mkfont.c

@@ -1146,11 +1146,18 @@ main (int argc, char *argv[])
     {
       FT_Face ft_face;
       int size;
+      FT_Error err;
 
-      if (FT_New_Face (ft_lib, argv[optind], font_index, &ft_face))
+      err = FT_New_Face (ft_lib, argv[optind], font_index, &ft_face);
+      if (err)
 	{
-	  grub_util_info ("can't open file %s, index %d", argv[optind],
-			  font_index);
+	  grub_printf ("can't open file %s, index %d: error %d", argv[optind],
+		       font_index, err);
+	  if (err > 0 && err < (signed) ARRAY_SIZE (ft_errmsgs))
+	    printf (": %s\n", ft_errmsgs[err]);
+	  else
+	    printf ("\n");
+
 	  continue;
 	}
 

util/grub.d/20_linux_xen.in

@@ -60,11 +60,11 @@ linux_entry ()
   args="$5"
   xen_args="$6"
   if ${recovery} ; then
-    title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")"
+    title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
   else
-    title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
+    title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
   fi
-  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
   if ! ${recovery} ; then
       save_default_entry | sed -e "s/^/\t/"
   fi
@@ -73,10 +73,12 @@ linux_entry ()
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
   printf '%s\n' "${prepare_boot_cache}"
-  message="$(gettext_printf "Loading Linux %s ..." ${version})"
+  xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
+  lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
   cat << EOF
-	echo	'$message'
+	echo	'$xmessage'
 	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+	echo	'$lmessage'
 	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then