r631 - in lvm2/trunk/debian: . initramfs-tools/hooks initramfs-tools/scripts/local-top

[Bastian Blank]

Author: waldi
Date: Fri Nov 21 14:51:18 2008
New Revision: 631

Log:
* debian/changelog: Update.
* debian/initramfs-tools/hooks/lvm2: Install lvm.
* debian/initramfs-tools/scripts/local-top/lvm2: Use lvm binary.


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

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Fri Nov 21 14:51:18 2008
@@ -3,6 +3,7 @@
   * Set locking dir to /lib/init/rw/lvm as we need a writable array early
     during boot. (closes: #506354)
   * Disable cluster support in udeb.
+  * Install the binary as lvm in the initramfs. (closes: #503627)
 
  -- Bastian Blank <waldi at debian.org>  Fri, 21 Nov 2008 15:41:24 +0100
 

Modified: lvm2/trunk/debian/initramfs-tools/hooks/lvm2
==============================================================================
--- lvm2/trunk/debian/initramfs-tools/hooks/lvm2	(original)
+++ lvm2/trunk/debian/initramfs-tools/hooks/lvm2	Fri Nov 21 14:51:18 2008
@@ -20,7 +20,7 @@
 
 . /usr/share/initramfs-tools/hook-functions
 
-copy_exec /sbin/vgchange /sbin
+copy_exec /sbin/lvm /sbin
 
 for x in dm_mod dm_snapshot dm_mirror; do
 	manual_add_modules ${x}

Modified: lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2
==============================================================================
--- lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2	(original)
+++ lvm2/trunk/debian/initramfs-tools/scripts/local-top/lvm2	Fri Nov 21 14:51:18 2008
@@ -27,12 +27,12 @@
 	# Take care of lilo boot arg, risky activating of all vg
 	case $vg in
 	fe[0-9]*)
-		vgchange -ay
+		lvm vgchange -ay
 		exit 0
 		;;
 	# FIXME: check major
 	/dev/root)
-		vgchange -ay
+		lvm vgchange -ay
 		exit 0
 		;;
 	esac
@@ -53,10 +53,10 @@
 	# Reduce padded --'s to -'s
 	vg=$(echo ${vg} | sed -e 's#--#-#g')
 
-	vgchange -ay ${vg}
+	lvm vgchange -ay ${vg}
 }
 
-if [ ! -e /sbin/vgchange ]; then
+if [ ! -e /sbin/lvm ]; then
 	exit 0
 fi