diff -Naur grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-2.02~beta2/util/grub.d/10_linux.in
--- grub-2.00.orig/util/grub.d/10_linux.in	2012-04-18 23:24:38.000000000 +0200
+++ grub-2.00/util/grub.d/10_linux.in	2012-06-30 07:53:03.765625589 +0200
@@ -198,7 +198,8 @@
 	   "initramfs-genkernel-${version}" \
 	   "initramfs-genkernel-${alt_version}" \
 	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \
+	   "initrd.gz"; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break

diff -Naur grub-2.02~beta2.orig/util/grub.d/00_header.in grub2-2.02~beta2/util/grub/00_header.in
--- grub-2.02~beta2.orig/util/grub.d/00_header.in	2013-12-24 08:45:34.000000000 -0800
+++ grub-2.02~beta2/util/grub.d/00_header.in	2015-01-27 21:55:45.697000000 -0800
@@ -153,7 +153,7 @@
 EOF
     else
 	for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do
-	    for basename in unicode unifont ascii; do
+	    for basename in unicode unifont dejavusansmono ascii; do
 		path="${dir}/${basename}.pf2"
 		if is_path_readable_by_grub "${path}" > /dev/null ; then
 		    font_path="${path}"
@@ -166,7 +166,7 @@
 	if [ -n "${font_path}" ] ; then
     cat << EOF
 if [ x\$feature_default_font_path = xy ] ; then
-   font=unicode
+   font=dejavusansmono
 else
 EOF
                 # Make the font accessible
@@ -179,7 +179,7 @@
 EOF
 	    else
     cat << EOF
-if loadfont unicode ; then
+if loadfont dejavusansmono ; then
 EOF
 	    fi
 	fi
 
diff -Naur grub-2.02~beta2.orig/util/grub-mkconfig.in grub-2.02~beta2/util/grub-mkconfig.in
--- grub-2.02~beta2.orig/util/grub-mkconfig.in	2013-12-24 08:46:40.000000000 -0800
+++ grub-2.02~beta2/util/grub-mkconfig.in	2015-01-26 23:39:24.521000000 -0800
@@ -129,8 +129,9 @@
 fi
 
 # Device containing our userland.  Typically used for root= parameter.
-GRUB_DEVICE="`${grub_probe} --target=device /`"
-GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
+GRUB_DEVICE="`${grub_probe} --target=device /`" || GRUB_DEVICE="`legacy_find_root_device`"
+GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || \
+    GRUB_DEVICE_UUID="`legacy_convert_to_uuid ${GRUB_DEVICE}`"
 
 # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.
 GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
 
diff -Naur grub-2.02~beta2.orig/util/grub-mkconfig_lib.in grub-2.02~beta2/util/grub-mkconfig_lib
--- grub-2.02~beta2.orig/util/grub-mkconfig_lib.in	2013-12-17 13:45:18.000000000 -0800
+++ grub-2.02~beta2/util/grub-mkconfig_lib.in	2015-01-26 23:42:43.932000000 -0800
@@ -264,6 +264,82 @@
   echo "$version_find_latest_a"
 }
 
+legacy_find_device ()
+{
+    mount_point=$1
+
+    # Autodetect current root device
+    device=
+    if [ -f /etc/fstab ] ; then
+        device="`awk '$1!~/^#/{
+          if ($2 ~ "^/+$") { $2 = "/"; } else { sub("/*$", "", $2); }
+          if ($2 == "'"$mount_point"'"){
+                  print $1;
+              }
+          }' /etc/fstab | tail -n 1`"
+    fi
+
+    if [ -n "$device" ] ; then
+        case "$device" in
+            LABEL=* | UUID=*)
+                device="`findfs $device`"
+                device="`readlink -f "$device"`"
+            ;;
+            *)
+                device=`readlink -f "$device"`
+            ;;
+        esac
+    fi
+
+    echo $device
+}
+
+legacy_find_root_device ()
+{
+    echo "Cannot determine root device.  Trying legacy probe method" >&2
+    device="`legacy_find_device /`"
+
+    if [ -z "$device" ]; then
+        echo "Cannot determine root device.  Assuming /dev/sda1" >&2
+        echo "This error is probably caused by an invalid /etc/fstab" >&2
+        device=/dev/sda1
+    fi
+
+    echo $device
+}
+
+legacy_convert_to_uuid()
+{
+    echo "Cannot determine uuid of root device.  Trying legacy probe method" >&2
+    local dev; dev="$1"
+
+    convert=false
+    case "$dev" in
+        /dev/disk/*)
+          ;;
+        /dev/mapper/*)
+          ;;
+        /dev/evms/[hs]d[a-z][0-9]*)
+            convert=:
+          ;;
+        /dev/evms/*)
+          ;;
+        /dev/md[0-9]*)
+          ;;
+        /dev/*)
+            convert=:
+          ;;
+    esac
+    if $convert; then
+        if [ -b "$dev" ]; then
+            uuid="`blkid -o value -s UUID "$dev" || true`"
+        fi
+    fi
+
+    echo "$uuid"
+}
+
+
 # One layer of quotation is eaten by "" and the second by sed; so this turns
 # ' into \'.
 grub_quote () {
 
diff -Naur grub-2.02~beta2.orig/util/grub-install.c grub-2.02~beta2/util/grub-install.c
--- grub-2.02~beta2.orig/util/grub-install.c	2013-12-24 08:40:31.000000000 -0800
+++ grub-2.02~beta2/util/grub-install.c.new	2015-01-27 22:07:56.714000000 -0800
@@ -827,7 +827,7 @@
   grub_util_host_init (&argc, &argv);
   product_version = xstrdup (PACKAGE_VERSION);
   pkgdatadir = grub_util_get_pkgdatadir ();
-  label_font = grub_util_path_concat (2, pkgdatadir, "unicode.pf2");
+  label_font = grub_util_path_concat (2, pkgdatadir, "dejavusansmono.pf2");
 
   argp_parse (&argp, argc, argv, 0, 0, 0);