packages: grub2/grub2.spec, grub2/grub-lvmdevice.patch (NEW) - lvm modename...

[glen]

Author: glen                         Date: Tue Nov 17 15:06:35 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- lvm modename rewrite as in geninitrd; rel 4

---- Files affected:
packages/grub2:
   grub2.spec (1.63 -> 1.64) , grub-lvmdevice.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.63 packages/grub2/grub2.spec:1.64
--- packages/grub2/grub2.spec:1.63	Tue Nov 17 15:57:27 2009
+++ packages/grub2/grub2.spec	Tue Nov 17 16:06:30 2009
@@ -9,7 +9,7 @@
 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
@@ -26,6 +26,7 @@
 Patch2:		grub-garbage.patch
 Patch3:		grub-shelllib.patch
 Patch4:		grub-install.in.patch
+Patch5:		grub-lvmdevice.patch
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	gawk
@@ -132,6 +133,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -273,6 +275,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2009/11/17 15:06:30  glen
+- lvm modename rewrite as in geninitrd; rel 4
+
 Revision 1.63  2009/11/17 14:57:27  glen
 - do not overwrite grub.d/40_custom on upgrade
 

================================================================
Index: packages/grub2/grub-lvmdevice.patch
diff -u /dev/null packages/grub2/grub-lvmdevice.patch:1.1
--- /dev/null	Tue Nov 17 16:06:35 2009
+++ packages/grub2/grub-lvmdevice.patch	Tue Nov 17 16:06:30 2009
@@ -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.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.63&r2=1.64&f=u