Update patch for comment diffs.

sys-boot/grub/Manifest

@@ -1,6 +1,6 @@
 AUX defaults 1019 RMD160 ac86956eec27bfb7f02564b94b387cda3c9fb2a5 SHA1 108b4b0aa3fb2a50c9aa6d20e4fb7c239f35feb1 SHA256 70031c9dd25afb304b5206d135292af0fe33f71e82b8bc49dae9264e177b8c40
 AUX grub-1.99-chroot.patch 7430 RMD160 6f01cae9e7a89445705a9ac2c368e3905d26492a SHA1 45579618642a2c57bfb726c01e1341ae628e12c3 SHA256 8dde001253e53bf9d8ad729f5b6241432900206cdd2ab17c43a8ee465ea9cf2e
-AUX grub-1.99-lvm_mapper-r1.patch 2328 RMD160 dcb0b67755991fac12cc3fbbfd29d783fee18860 SHA1 26ac637a323f78da9b472f38284dcc430a821f1b SHA256 97f9528e85bdb782f6757820d38292d67b61c09572e610d7a18c64c8b95fa58b
+AUX grub-1.99-lvm_mapper-r1.patch 2422 RMD160 875a891990b84f3992f2e45bfbc85452c0bebefd SHA1 ebc79cc131279f793ad1bb77acf29e12a7c76a09 SHA256 4eacca556d8f4e4fbd96f5dfc90d9828f6e5ab519b50b11fa7e82740113275c5
 AUX grub-1.99-lvm_mapper.patch 1012 RMD160 172b26f017765ce72b2266942544f6a2198ca13b SHA1 2380431c33fea1099aa62bb81428cf137c54603f SHA256 828b25d9f58baf156240b4e3da7a8c8b8a9db74219115b70f200d4ee6f2ac819
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
 DIST grub-1.99.tar.gz 4652619 RMD160 63293381ac2ed2479ac65896d4744b866e6d216c SHA1 6d0536da38224e7caf94cf2531a5f921ac057b9b SHA256 b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff

sys-boot/grub/files/grub-1.99-lvm_mapper-r1.patch

@@ -1,4 +1,4 @@
-commit 12564fda0ef25d65db2ef2da444abde448a87a71
+commit ef471478e4b8950a3312ffc736113f9b9e8946f2
 Author: Mike Hiretsky <mh@calculate.ru>
 Date:   Tue Jul 26 18:20:55 2011 +0400
 
@@ -11,30 +11,32 @@ Date:   Tue Jul 26 18:20:55 2011 +0400
     For resolve the problem filesystem for that devices determined by device
     to which they point. (readlink -f)
 
-diff --git a/util/grub-install.in b/util/grub-install.in
-index 16236ba..7ebbb50 100644
---- a/util/grub-install.in
-+++ b/util/grub-install.in
-@@ -466,6 +466,10 @@ fi
+diff --git util/grub-install.in util/grub-install.in
+index 16236ba..8cf86be 100644
+--- util/grub-install.in
++++ util/grub-install.in
+@@ -465,6 +465,11 @@ fi
+ 
  # Create the core image. First, auto-detect the filesystem module.
  fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device}"`"
- if test "x$fs_module" = x ; then
++# sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
++if test "x$fs_module" = x ; then
 +    grub_device_fs=$(readlink -f ${grub_device})
 +    fs_module="`"$grub_probe" --device-map="${device_map}" --target=fs --device "${grub_device_fs}"`"
 +fi
-+if test "x$fs_module" = x ; then
+ if test "x$fs_module" = x ; then
      echo "Auto-detection of a filesystem of ${grub_device} failed." 1>&2
      echo "Try with --recheck." 1>&2
-     echo "If the problem persists please report this together with the output of \"$grub_probe --device-map=\"${device_map}\" --target=fs -v ${grubdir}\" to <bug-grub@gnu.org>" 1>&2
-diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 2c5fd8c..ace6c28 100644
---- a/util/grub-mkconfig_lib.in
-+++ b/util/grub-mkconfig_lib.in
-@@ -58,7 +58,10 @@ is_path_readable_by_grub ()
+diff --git util/grub-mkconfig_lib.in util/grub-mkconfig_lib.in
+index 2c5fd8c..a2dcd20 100644
+--- util/grub-mkconfig_lib.in
++++ util/grub-mkconfig_lib.in
+@@ -58,7 +58,11 @@ is_path_readable_by_grub ()
  
    # abort if file is in a filesystem we can't read
    if "${grub_probe}" -t fs "$path" > /dev/null 2>&1 ; then : ; else
 -    return 1
++    # sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
 +    fsdevice=`readlink -f $(${grub_probe} -t device "$path" 2>/dev/null)`
 +    if "${grub_probe}" -t fs -d "${fsdevice}" > /dev/null 2>&1 ; then : ; else
 +      return 1
@@ -42,11 +44,12 @@ index 2c5fd8c..ace6c28 100644
    fi
  
    # ... or if we can't figure out the abstraction module, for example if
-@@ -121,7 +124,12 @@ prepare_grub_to_access_device ()
+@@ -121,7 +125,13 @@ prepare_grub_to_access_device ()
      esac
    done
  
 -  fs="`"${grub_probe}" --device "${device}" --target=fs`"
++  # sometimes filesystem on LVM (place in /dev/mapper) is not detected. Try detect by /dev/dm-X
 +  if "${grub_probe}" --device "${device}" --target=fs >/dev/null 2>/dev/null; then
 +    device_fs="${device}"
 +  else