r702 - in lvm2/trunk/debian: . contrib/lvm2/usr/share/initramfs-tools/hooks contrib/lvm2/usr/share/initramfs-tools/scripts/local-top

[Bastian Blank]

Author: waldi
Date: Mon Aug 17 16:43:01 2009
New Revision: 702

Log:
* debian/changelog: Update.
* debian/contrib/lvm2/usr/share/initramfs-tools/hooks/lvm2: Install dmsetup.
* debian/contrib/lvm2/usr/share/initramfs-tools/scripts/local-top/lvm2:
  Use dmsetup splitnames.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/hooks/lvm2
   lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/scripts/local-top/lvm2

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Mon Aug 17 16:09:52 2009	(r701)
+++ lvm2/trunk/debian/changelog	Mon Aug 17 16:43:01 2009	(r702)
@@ -11,6 +11,7 @@
     - Make lvm2 depend on dmsetup.
     - Make dmsetup depend on new util-linux for blkid.
   * Install fsadm.
+  * Use dmsetup splitnames in initramfs-tools support.
 
  -- Bastian Blank <waldi at debian.org>  Mon, 23 Feb 2009 01:10:29 +0100
 

Modified: lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/hooks/lvm2
==============================================================================
--- lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/hooks/lvm2	Mon Aug 17 16:09:52 2009	(r701)
+++ lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/hooks/lvm2	Mon Aug 17 16:43:01 2009	(r702)
@@ -25,7 +25,8 @@
 	cp /etc/lvm/lvm.conf ${DESTDIR}/etc/lvm/
 fi
 
-copy_exec /sbin/lvm /sbin
+copy_exec /sbin/dmsetup
+copy_exec /sbin/lvm
 ln -s lvm ${DESTDIR}/sbin/vgchange
 
 for x in dm_mod dm_snapshot dm_mirror; do

Modified: lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/scripts/local-top/lvm2
==============================================================================
--- lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/scripts/local-top/lvm2	Mon Aug 17 16:09:52 2009	(r701)
+++ lvm2/trunk/debian/contrib/lvm2/usr/share/initramfs-tools/scripts/local-top/lvm2	Mon Aug 17 16:43:01 2009	(r702)
@@ -17,15 +17,15 @@
 
 activate_vg()
 {
-	local vg="$1"
+	local dev="$1"
 
 	# Make sure that we have a non-empty argument
-	if [ -z "${vg}" ]; then
+	if [ -z "$dev" ]; then
 		return 1
 	fi
 
 	# Take care of lilo boot arg, risky activating of all vg
-	case $vg in
+	case "$dev" in
 	fe[0-9]*)
 		lvm vgchange -aly --ignorelockingfailure
 		exit 0
@@ -38,22 +38,16 @@
 	esac
 
 	# Make sure that we have a d-m path
-	vg=${vg#/dev/mapper/}
-	if [ "$vg" = "$1" ]; then
+	dev="${dev#/dev/mapper/}"
+	if [ "$dev" = "$1" ]; then
 		return 1
 	fi
 
-	# Make sure that the device includes at least one dash
-	if [ "$(echo -n "$vg" | tr -d -)" = "$vg" ]; then
-		return 1
-	fi
+	eval $(dmsetup splitname --nameprefixes --noheadings --rows "$dev")
 
-	# Split volume group from logical volume.
-	vg=$(echo ${vg} | sed -e 's#\(.*\)\([^-]\)-[^-].*#\1\2#')
-	# Reduce padded --'s to -'s
-	vg=$(echo ${vg} | sed -e 's#--#-#g')
-
-	lvm vgchange -aly --ignorelockingfailure ${vg}
+	if [ "$DM_VG_NAME" ] && [ "$DM_LV_NAME" ]; then
+		lvm vgchange -aly --ignorelockingfailure "$DM_VG_NAME"
+	fi
 }
 
 if [ ! -e /sbin/lvm ]; then