Merge lp:~serge-hallyn/ubuntu/natty/multipath-tools/kpartx-p into lp:ubuntu/natty/multipath-tools

[Serge Hallyn]

[Chuck Short (zulcss)]

review: Approve

Unmerged revisions

36. By Serge Hallyn on 2011-02-04

pass '-p part' to kpartx in initramfs script, not '-p p', to
make sure /dev/mapper/ names are formed as expected. (LP: #712840)

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-04 16:06:29 +0000
+++ debian/changelog	2011-02-04 00:52:02 +0000
@@ -1,3 +1,10 @@
+multipath-tools (0.4.8-14ubuntu8) natty; urgency=low
+
+  * pass '-p part' to kpartx in initramfs script, not '-p p', to
+    make sure /dev/mapper/ names are formed as expected.  (LP: #712840)
+
+ -- Serge Hallyn <[e-mail]>  Thu, 03 Feb 2011 18:40:36 -0600
+
 multipath-tools (0.4.8-14ubuntu7) natty; urgency=low
 
   * Add patch to fix the expected pathname from multipath uevents
 
=== modified file 'debian/initramfs/local-top'
--- debian/initramfs/local-top	2011-01-04 16:06:29 +0000
+++ debian/initramfs/local-top	2011-02-04 00:52:02 +0000
@@ -29,7 +29,7 @@
 /sbin/multipath -v $VERBOSITY
 
 if [ -x /sbin/kpartx ]; then
-	/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null
+	/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p part" >/dev/null
 fi
 udevadm settle