Ubuntu

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

Proposed by Phillip Susi on 2012-03-23
Status: Merged
Merged at revision: 47
Proposed branch: lp:~psusi/ubuntu/precise/multipath-tools/fix-dmraid
Merge into: lp:ubuntu/precise/multipath-tools
Diff against target: 185 lines (+114/-6) 7 files modified
To merge this branch: bzr merge lp:~psusi/ubuntu/precise/multipath-tools/fix-dmraid
Reviewer Review Type Date Requested Status
Phillip Susi (community) Resubmit on 2012-03-31
Serge Hallyn Needs Fixing on 2012-03-30
Ubuntu branches 2012-03-23 Pending
Review via email: mp+98958@code.launchpad.net
To post a comment you must log in.
Serge Hallyn (serge-hallyn) wrote :

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) wrote :

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) wrote :

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

review: Resubmit
Serge Hallyn (serge-hallyn) wrote :

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) wrote :

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) wrote :

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

Adam Conrad (adconrad) wrote :

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).

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-21 14:34:53 +0000
3+++ debian/changelog 2012-03-31 02:15:26 +0000
4@@ -1,3 +1,9 @@
5+multipath-tools (0.4.9-3ubuntu5) precise; urgency=low
6+
7+ * Split kpartx part of multipath-tools-boot into kpartx-boot for dmraid
8+
9+ -- Phillip Susi <psusi@ubuntu.com> Tue, 20 Mar 2012 15:26:22 -0400
10+
11 multipath-tools (0.4.9-3ubuntu4) precise; urgency=low
12
13 * Restore multipath-udeb dependency on multipath-modules (LP: #959749).
14
15=== modified file 'debian/control'
16--- debian/control 2012-03-21 14:33:58 +0000
17+++ debian/control 2012-03-31 02:15:26 +0000
18@@ -45,10 +45,16 @@
19 Kpartx can be used to set up device mappings for the partitions of any
20 partitioned block device. It is part of the Linux multipath-tools.
21
22+Package: kpartx-boot
23+Architecture: all
24+Depends: ${misc:Depends}, initramfs-tools, kpartx (= ${source:Version})
25+Description: Provides kpartx during boot
26+ This package makes kpartx availible during boot to activate partitions
27+
28 Package: multipath-tools-boot
29 Architecture: all
30 Depends: ${misc:Depends}, initramfs-tools,
31- multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~)
32+ multipath-tools (= ${source:Version}), kpartx-boot (= ${source:Version})
33 Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1)
34 Conflicts: multipath-tools-initramfs (<< 1.0.1+nmu1)
35 Description: Support booting from multipath devices
36
37=== modified file 'debian/initramfs/hooks'
38--- debian/initramfs/hooks 2011-06-06 12:31:23 +0000
39+++ debian/initramfs/hooks 2012-03-31 02:15:26 +0000
40@@ -27,7 +27,7 @@
41
42 add_udev_rules()
43 {
44- for rules in 95-multipath.rules 95-kpartx.rules; do
45+ for rules in 95-multipath.rules; do
46 if [ -e /lib/udev/rules.d/$rules ]; then
47 cp -p /lib/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
48 fi
49@@ -35,10 +35,6 @@
50 }
51
52 copy_exec /sbin/multipath /sbin
53-copy_exec /sbin/kpartx /sbin
54-copy_exec /sbin/dmsetup /sbin
55-copy_exec /lib/udev/dmsetup_env /lib/udev
56-copy_exec /lib/udev/kpartx_id /lib/udev
57 mkdir -p $DESTDIR/lib/multipath/
58 for x in /lib/multipath/*; do
59 copy_exec $x /lib/multipath/
60
61=== added file 'debian/initramfs/kpartx.hook'
62--- debian/initramfs/kpartx.hook 1970-01-01 00:00:00 +0000
63+++ debian/initramfs/kpartx.hook 2012-03-31 02:15:26 +0000
64@@ -0,0 +1,20 @@
65+#!/bin/sh
66+
67+PREREQS="udev"
68+
69+prereqs() { echo "$PREREQS"; }
70+
71+case $1 in
72+prereqs)
73+ prereqs
74+ exit 0
75+ ;;
76+esac
77+
78+. /usr/share/initramfs-tools/hook-functions
79+
80+copy_exec /sbin/kpartx /sbin
81+copy_exec /sbin/dmsetup /sbin
82+copy_exec /lib/udev/dmsetup_env /lib/udev
83+copy_exec /lib/udev/kpartx_id /lib/udev
84+cp -p /lib/udev/rules.d/95-kpartx.rules $DESTDIR/lib/udev/rules.d/
85
86=== added file 'debian/kpartx-boot.postinst'
87--- debian/kpartx-boot.postinst 1970-01-01 00:00:00 +0000
88+++ debian/kpartx-boot.postinst 2012-03-31 02:15:26 +0000
89@@ -0,0 +1,34 @@
90+#!/bin/sh
91+# postinst script for kpartx-boot
92+#
93+# see: dh_installdeb(1)
94+
95+set -e
96+
97+# Source debconf library.
98+. /usr/share/debconf/confmodule
99+
100+case "$1" in
101+ configure)
102+ if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
103+ update-initramfs -u
104+ fi
105+ ;;
106+
107+ abort-upgrade|abort-remove|abort-deconfigure)
108+ ;;
109+
110+ *)
111+ echo "postinst called with unknown argument \`$1'" >&2
112+ exit 1
113+ ;;
114+esac
115+
116+# dh_installdeb will replace this with shell code automatically
117+# generated by other debhelper scripts.
118+
119+#DEBHELPER#
120+
121+exit 0
122+
123+
124
125=== added file 'debian/kpartx-boot.postrm'
126--- debian/kpartx-boot.postrm 1970-01-01 00:00:00 +0000
127+++ debian/kpartx-boot.postrm 2012-03-31 02:15:26 +0000
128@@ -0,0 +1,45 @@
129+#!/bin/sh
130+# postrm script for kpartx-boot
131+#
132+# see: dh_installdeb(1)
133+
134+set -e
135+
136+# summary of how this script can be called:
137+# * <postrm> `remove'
138+# * <postrm> `purge'
139+# * <old-postrm> `upgrade' <new-version>
140+# * <new-postrm> `failed-upgrade' <old-version>
141+# * <new-postrm> `abort-install'
142+# * <new-postrm> `abort-install' <old-version>
143+# * <new-postrm> `abort-upgrade' <old-version>
144+# * <disappearer's-postrm> `disappear' <overwriter>
145+# <overwriter-version>
146+# for details, see http://www.debian.org/doc/debian-policy/ or
147+# the debian-policy package
148+
149+
150+case "$1" in
151+ remove)
152+ if [ -x /usr/sbin/update-initramfs -a -e /etc/initramfs-tools/initramfs.conf ]; then
153+ update-initramfs -u
154+ fi
155+ ;;
156+
157+ purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
158+ ;;
159+
160+ *)
161+ echo "postrm called with unknown argument \`$1'" >&2
162+ exit 1
163+ ;;
164+esac
165+
166+# dh_installdeb will replace this with shell code automatically
167+# generated by other debhelper scripts.
168+
169+#DEBHELPER#
170+
171+exit 0
172+
173+
174
175=== modified file 'debian/rules'
176--- debian/rules 2011-06-06 12:31:23 +0000
177+++ debian/rules 2012-03-31 02:15:26 +0000
178@@ -47,6 +47,7 @@
179 dh_install -X.rules --fail-missing --sourcedir=$(CURDIR)/debian/tmp
180 # initramfs stuff:
181 install -D -m 755 debian/initramfs/hooks $(INITRAMFS)/hooks/multipath
182+ install -D -m 755 debian/initramfs/kpartx.hook $(CURDIR)/debian/kpartx-boot/usr/share/initramfs-tools/hooks/kpartx
183 install -D -m 755 debian/initramfs/local-top \
184 $(INITRAMFS)/scripts/local-top/multipath
185 # reportbug:

Subscribers

People subscribed via source and target branches

to all changes: