Index: grub-2.02/util/grub.d/30_os-prober.in
===================================================================
--- grub-2.02.orig/util/grub.d/30_os-prober.in
+++ grub-2.02/util/grub.d/30_os-prober.in
@@ -216,7 +216,7 @@ EOF
         LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
         LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
         LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
-        LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
+        LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`"
         LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
 
         if [ -z "${LLABEL}" ] ; then
@@ -225,7 +225,7 @@ EOF
 
 	if [ "${LROOT}" != "${LBOOT}" ]; then
 	  LKERNEL="${LKERNEL#/boot}"
-	  LINITRD="${LINITRD#/boot}"
+	  LINITRD="$(echo $LINITRD | sed -e 's!^/boot!!' -e 's!\(\s\)/boot!\1!g')"
 	fi
 
 	onstr="$(gettext_printf "(on %s)" "${DEVICE}")"