- lvm modename rewrite as in geninitrd; rel 4

Changed files:
    grub-lvmdevice.patch -> 1.1
    grub2.spec -> 1.64

diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch
new file mode 100644 (file)
index 0000000..2c2096c
--- /dev/null
+++ b/grub-lvmdevice.patch
@@ -0,0 +1,22 @@
+--- grub-1.97.1/util/grub-mkconfig.in~ 2009-11-17 17:02:16.626243372 +0200
++++ grub-1.97.1/util/grub-mkconfig.in  2009-11-17 17:02:08.346050859 +0200
+@@ -120,6 +120,19 @@
+ 
+ # Device containing our userland.  Typically used for root= parameter.
+ GRUB_DEVICE="`${grub_probe} --target=device /`"
++
++# Rewrite to sane LVM node (Code from PLD Linux geninitrd):
++# /dev/mapper/sys-rootfs -> /dev/sys/rootfs
++# /dev/mapper/blodnatt-blah--bleh -> /dev/blodnatt/blah-bleh
++case "$GRUB_DEVICE" in
++/dev/mapper/*-*)
++      GRUB_DEVICE=${GRUB_DEVICE#/dev/mapper/}
++      local VG=${GRUB_DEVICE%%-*}
++      local LV=$(echo "${GRUB_DEVICE#$VG-}" | awk '{gsub(/--/, "-"); print}')
++      GRUB_DEVICE=/dev/$VG/$LV
++;;
++esac
++
+ GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
+ 
+ # Device containing our /boot partition.  Usually the same as GRUB_DEVICE.

diff --git a/grub2.spec b/grub2.spec
index 8905b3dab84554d4b1a1843c9e554b7b48f7c1b3..3c1b47b0f62482891cecfcd96614384f82f1b055 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -8,7 +8,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.97.1
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Base
 # svn export svn://svn.sv.gnu.org/grub/trunk/grub2
@@ -25,6 +25,7 @@ Patch1:               pld-sysconfdir.patch
 Patch2:                grub-garbage.patch
 Patch3:                grub-shelllib.patch
 Patch4:                grub-install.in.patch
+Patch5:                grub-lvmdevice.patch
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: gawk
@@ -131,6 +132,7 @@ avançados e que querem mais recursos de seu boot loader.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .