--- grub-mkconfig_lib.old 2017-07-05 16:19:08.969809977 +0100

+++ grub-mkconfig_lib 2017-07-05 16:13:31.909121589 +0100

@@ -172,13 +172,16 @@

   if [ "x$fs_hint" != x ]; then

     echo "set root='$fs_hint'"

   fi

-  if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then

-    hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=

-    echo "if [ x\$feature_platform_search_hint = xy ]; then"

-    echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"

-    echo "else"

-    echo "  search --no-floppy --fs-uuid --set=root ${fs_uuid}"

-    echo "fi"

+  if [ "x${GRUB_DISABLE_LINUX_UUID}" != "xtrue" ] ; then

+

+    if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then

+      hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=

+      echo "if [ x\$feature_platform_search_hint = xy ]; then"

+      echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"

+      echo "else"

+      echo "  search --no-floppy --fs-uuid --set=root ${fs_uuid}"

+      echo "fi"

+    fi

   fi

   IFS="$old_ifs"