r638 - in lvm2/trunk/debian: . initramfs-tools/hooks

[Bastian Blank]

Author: waldi
Date: Fri Nov 21 17:03:54 2008
New Revision: 638

Log:
* debian/changelog: Update.
* debian/initramfs-tools/hooks/lvm2
  - Install lvm.conf.
  - Check for /sbin/lvm.


Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/initramfs-tools/hooks/lvm2

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Fri Nov 21 17:03:54 2008
@@ -1,3 +1,9 @@
+lvm2 (2.02.39-5) UNRELEASED; urgency=low
+
+  * Install lvm.conf into initramfs. (closes: #439761)
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 21 Nov 2008 18:05:58 +0100
+
 lvm2 (2.02.39-4) unstable; urgency=low
 
   * Revert locking change, it breaks too much. (closes: #506354)

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 17:03:54 2008
@@ -14,12 +14,17 @@
 	;;
 esac
 
-if [ ! -x /sbin/vgchange ]; then
+if [ ! -x /sbin/lvm ]; then
 	exit 0
 fi
 
 . /usr/share/initramfs-tools/hook-functions
 
+if [ -e /etc/lvm/lvm.conf ]; then
+	mkdir -p ${DESTDIR}/etc/lvm
+	cp /etc/lvm/lvm.conf ${DESTDIR}/etc/lvm/
+fi
+
 copy_exec /sbin/lvm /sbin
 
 for x in dm_mod dm_snapshot dm_mirror; do