Merge lp:~psusi/ubuntu/precise/multipath-tools/fix-dmraid into lp:ubuntu/precise/multipath-tools

[Phillip Susi]

[Serge Hallyn (serge-hallyn)]

Thanks for doing this work. The patch looks good. However there has been an update to multipath-tools, so your patch needs to be forward ported.

Is there any urgent bug being fixed by this? If not, then it seems late in the precise cycle to push such a change, but I would support it for after precise.

Is it possible for this to also (perhaps first) be done in Debian?

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Hi Philip, I've changed this to "Work In Progress". Please switch it back to 'Needs Review' when you have re-merged w/ the packaging branch and after "Q" opens for development (this is too much change this late in the cycle)

[Phillip Susi (psusi)]

This fixes a critical regression so needs to make it into precise. I performed the trival changelog merge.

review: Needs Resubmitting

[Serge Hallyn (serge-hallyn)]

Quoting Phillip Susi (<email address hidden>):
> Review: Resubmit
>
> This fixes a critical regression so needs to make it into precise. I performed the trival changelog merge.

Hi Phillip,

this tree isn't linked against any bugs. Could you please explicitly say
what the critical regression being addressed is? Best would be a bug # for
a critical bug with reproduction steps. That could help the merge to be
acceptable this cycle.

[Serge Hallyn (serge-hallyn)]

Quoting Serge Hallyn (<email address hidden>):
> Quoting Phillip Susi (<email address hidden>):
> > Review: Resubmit
> >
> > This fixes a critical regression so needs to make it into precise. I performed the trival changelog merge.
>
> Hi Phillip,
>
> this tree isn't linked against any bugs. Could you please explicitly say
> what the critical regression being addressed is? Best would be a bug # for
> a critical bug with reproduction steps. That could help the merge to be
> acceptable this cycle.

Ah, I see it now inthe new mp. thanks.

[Phillip Susi (psusi)]

Huh? It is linked to the bug, right there at the top of the page.

[Adam Conrad (adconrad)]

I've uploaded this with only two small changes. One was to mention the bug in the changelog (please don't forget that in the future), the other was to revert to Debian's all->any versioned dep scheme (foo (>= source), foo (<< source.1~)), since they will want that if you try to push this back to them (I assume they did this to avoid binNMU breakage).

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-21 14:34:53 +0000
+++ debian/changelog	2012-03-31 02:15:26 +0000
@@ -1,3 +1,9 @@
+multipath-tools (0.4.9-3ubuntu5) precise; urgency=low
+
+  * Split kpartx part of multipath-tools-boot into kpartx-boot for dmraid
+
+ -- Phillip Susi <[e-mail]>  Tue, 20 Mar 2012 15:26:22 -0400
+
 multipath-tools (0.4.9-3ubuntu4) precise; urgency=low
 
   * Restore multipath-udeb dependency on multipath-modules (LP: #959749).
 
=== modified file 'debian/control'
--- debian/control	2012-03-21 14:33:58 +0000
+++ debian/control	2012-03-31 02:15:26 +0000
@@ -45,10 +45,16 @@
  Kpartx can be used to set up device mappings for the partitions of any
  partitioned block device. It is part of the Linux multipath-tools.
 
+Package: kpartx-boot
+Architecture: all
+Depends: ${misc:Depends}, initramfs-tools, kpartx (= ${source:Version})
+Description: Provides kpartx during boot
+ This package makes kpartx availible during boot to activate partitions
+
 Package: multipath-tools-boot
 Architecture: all
 Depends: ${misc:Depends}, initramfs-tools, 
- multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~)
+ multipath-tools (= ${source:Version}), kpartx-boot (= ${source:Version})
 Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1)
 Conflicts: multipath-tools-initramfs (<< 1.0.1+nmu1)
 Description: Support booting from multipath devices
 
=== modified file 'debian/initramfs/hooks'
--- debian/initramfs/hooks	2011-06-06 12:31:23 +0000
+++ debian/initramfs/hooks	2012-03-31 02:15:26 +0000
@@ -27,7 +27,7 @@
 
 add_udev_rules()
 {
-  for rules in 95-multipath.rules 95-kpartx.rules; do
+  for rules in 95-multipath.rules; do
     if [ -e /lib/udev/rules.d/$rules ]; then
       cp -p /lib/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
     fi
@@ -35,10 +35,6 @@
 }
 
 copy_exec /sbin/multipath 		/sbin
-copy_exec /sbin/kpartx    		/sbin
-copy_exec /sbin/dmsetup			/sbin
-copy_exec /lib/udev/dmsetup_env		/lib/udev
-copy_exec /lib/udev/kpartx_id		/lib/udev
 mkdir -p $DESTDIR/lib/multipath/
 for x in /lib/multipath/*; do
     copy_exec $x /lib/multipath/
 
=== added file 'debian/initramfs/kpartx.hook'
--- debian/initramfs/kpartx.hook	1970-01-01 00:00:00 +0000
+++ debian/initramfs/kpartx.hook	2012-03-31 02:15:26 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+PREREQS="udev"
+
+prereqs() { echo "$PREREQS"; }
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+copy_exec /sbin/kpartx /sbin
+copy_exec /sbin/dmsetup			/sbin
+copy_exec /lib/udev/dmsetup_env		/lib/udev
+copy_exec /lib/udev/kpartx_id		/lib/udev
+cp -p /lib/udev/rules.d/95-kpartx.rules $DESTDIR/lib/udev/rules.d/
 
=== added file 'debian/kpartx-boot.postinst'
--- debian/kpartx-boot.postinst	1970-01-01 00:00:00 +0000
+++ debian/kpartx-boot.postinst	2012-03-31 02:15:26 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+# postinst script for kpartx-boot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+	if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
+		update-initramfs -u
+	fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
 
=== added file 'debian/kpartx-boot.postrm'
--- debian/kpartx-boot.postrm	1970-01-01 00:00:00 +0000
+++ debian/kpartx-boot.postrm	2012-03-31 02:15:26 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+# postrm script for kpartx-boot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+	if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
+		update-initramfs -u
+	fi
+    ;;
+
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
 
=== modified file 'debian/rules'
--- debian/rules	2011-06-06 12:31:23 +0000
+++ debian/rules	2012-03-31 02:15:26 +0000
@@ -47,6 +47,7 @@
 	dh_install -X.rules --fail-missing --sourcedir=$(CURDIR)/debian/tmp
 	# initramfs stuff:
 	install -D -m 755 debian/initramfs/hooks $(INITRAMFS)/hooks/multipath
+	install -D -m 755 debian/initramfs/kpartx.hook $(CURDIR)/debian/kpartx-boot/usr/share/initramfs-tools/hooks/kpartx
 	install -D -m 755 debian/initramfs/local-top \
 		$(INITRAMFS)/scripts/local-top/multipath
 	# reportbug: