- rel 1; follow device mapper symlinks

Changed files:
    grub-1.98-follow-dev-mapper-symlinks.patch -> 1.1
    grub2.spec -> 1.97

diff --git a/grub-1.98-follow-dev-mapper-symlinks.patch b/grub-1.98-follow-dev-mapper-symlinks.patch
new file mode 100644 (file)
index 0000000..aead475
--- /dev/null
+++ b/grub-1.98-follow-dev-mapper-symlinks.patch
@@ -0,0 +1,25 @@
+--- a/util/getroot.c   2010-03-06 20:51:37.000000000 +0000
++++ b/util/getroot.c   2010-05-28 19:21:57.592307313 +0100
+@@ -222,9 +222,20 @@ find_root_device (const char *dir, dev_t
+       /* Ignore any error.  */
+       continue;
+ 
+-      if (S_ISLNK (st.st_mode))
+-      /* Don't follow symbolic links.  */
++      if (S_ISLNK (st.st_mode)) {
++#ifdef __linux__
++      if (strcmp (dir, "mapper") == 0) {
++        /* Follow symbolic links under /dev/mapper/; the canonical name
++           may be something like /dev/dm-0, but the names under
++           /dev/mapper/ are more human-readable and so we prefer them if
++           we can get them.  */
++        if (stat (ent->d_name, &st) < 0)
++          continue;
++      } else
++#endif /* __linux__ */
++      /* Don't follow other symbolic links.  */
+       continue;
++      }
+ 
+       if (S_ISDIR (st.st_mode))
+       {

diff --git a/grub2.spec b/grub2.spec
index 24f6e030b9f232693309b3487668b034fa25826c..435be5fe22d053059a0a092b69b93f3ad9821dc2 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,8 +7,6 @@
 #   --enable-grub-emu-usb conflicts with --enable-grub-emu-pci, emu-pci seems experimental
 #   - to build and install the `grub-emu' debugging utility we need to re-run build with --target=emu
 #   - put grub-emu to subpackage if it is fixed
-# - grub2-1.97.2-2.x86_64, grub2-1.98-0.5.x86_64 affected: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544577
-#   i.e "grub-probe /" would fail if rootfs is on lvm and /dev/mapper/foo-rootfs is symlink
 #
 # Conditional build:
 %bcond_with    static  # build static binaries
@@ -33,7 +31,7 @@ Summary(pl.UTF-8):    GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):  Gerenciador de inicialização GRUB2
 Name:          grub2
 Version:       1.98
-Release:       0.5
+Release:       1
 License:       GPL v2
 Group:         Base
 Source0:       http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
@@ -52,6 +50,7 @@ Patch5:               grub-lvmdevice.patch
 Patch6:                pld-mkconfigdir.patch
 Patch7:                grub-mkconfig-diagnostics.patch
 Patch8:                ppc.patch
+Patch9:                grub-1.98-follow-dev-mapper-symlinks.patch
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.11.1-1
 BuildRequires: bison
@@ -194,6 +193,7 @@ avançados e que querem mais recursos de seu boot loader.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %if "%{cc_version}" < "3.4"
 grep -rl -- -Wno-missing-field-initializers . | xargs sed -i -e 's,-Wno-missing-field-initializers,,'