diffstat of debian/ for multipath-tools_0.4.9-3 multipath-tools_0.4.9-3ubuntu7 changelog | 417 +++++++++++++++++++++++++++- control | 31 +- initramfs/hooks | 7 initramfs/kpartx.hook | 20 + initramfs/local-top | 7 kpartx-boot.postinst | 34 ++ kpartx-boot.postrm | 45 +++ kpartx-udeb.install | 1 kpartx.install | 4 kpartx.udev | 15 - multipath-tools.install | 4 multipath-tools.preinst | 4 multipath-udeb.install | 5 patches/0009-fix-delim.patch | 39 ++ patches/0010-fix-extended-partitions.patch | 47 +++ patches/1000--set-umask-in-multipathd.patch | 29 + patches/1001--fix-linking-command.patch | 18 + patches/series | 4 rules | 5 19 files changed, 707 insertions(+), 29 deletions(-) diff -Nru multipath-tools-0.4.9/debian/changelog multipath-tools-0.4.9/debian/changelog --- multipath-tools-0.4.9/debian/changelog 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/changelog 2013-01-30 01:10:55.000000000 +0000 @@ -1,3 +1,48 @@ +multipath-tools (0.4.9-3ubuntu7) raring; urgency=low + + * Add 0010-fix-extended-partitions.patch: Only expose the + first two sectors of the extended partition (LP: #1093918). + + -- Phillip Susi Fri, 04 Jan 2013 16:14:34 -0500 + +multipath-tools (0.4.9-3ubuntu6) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Fri, 05 Oct 2012 14:00:37 +0100 + +multipath-tools (0.4.9-3ubuntu5) precise; urgency=low + + * Split kpartx initramfs bits into kpartx-boot for dmraid (LP: #941874) + + -- Phillip Susi 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). + + -- Colin Watson Wed, 21 Mar 2012 14:34:01 +0000 + +multipath-tools (0.4.9-3ubuntu3) precise; urgency=low + + * Move kpartx from multipath-udeb to a new kpartx-udeb package + (LP: #922646). + + -- Colin Watson Fri, 27 Jan 2012 23:04:23 +0000 + +multipath-tools (0.4.9-3ubuntu2) precise; urgency=low + + * Add 0009-fix-delim.patch: The 'p' delimiter was being added + when it shouldn't. + + -- Phillip Susi Sun, 08 Jan 2012 20:57:47 -0500 + +multipath-tools (0.4.9-3ubuntu1) precise; urgency=low + + * Merge with Debian (for remaining changes, see 0.4.9-2ubuntu1). + + -- Matthias Klose Sun, 04 Dec 2011 21:32:48 +0100 + multipath-tools (0.4.9-3) unstable; urgency=low * [dd85b8b] Add example to kpartx manpage. Committed upstream. @@ -11,6 +56,36 @@ -- Ritesh Raj Sarraf Sat, 03 Dec 2011 19:34:59 +0530 +multipath-tools (0.4.9-2ubuntu1) oneiric; urgency=low + + * Merge from debian unstable, remaining changes: + - control: + * Bump debhelper dependency to install udev rules to + /lib/udev/rules.d, bump udev dependencies as well. + * multipath-udeb must not depend on multipath-modules, + because the Ubuntu kernel already includes the modules and no + package provides m-m. + - initramfs/hooks: use 95 not 60 for multipath rules priority + - multipath-tools-boot.init: remove in favor of kpartx.udev rules (at top) + - kpartx.udev: + * add rule to load dm-multipath + * use whole path when running /usr/lib/dmsetup_env + * call kpartx through dmsetup for mpath-* devices + * switch $name for $kernel for dmraid rule + - multipath-tools.preinst: modprobe dm-multipath. + This will make sure that multipathd will be able to start. + - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd. + - rules: Move udev rules to priority 95, because rules that load + modules should be >90. + - Have initramfs local-top start with scsi_wait_scan, and make sure all + devices have been found before bothering to call udevadm settle. + - debian/initramfs/local-top: wait for scsi_wait_scan + * *.install: use /lib*/ instead of /lib/ to catch /lib64 + * debian/initramfs/local-top: remove '--timeout 10' which causes my + test system to not boot roughly 3 out of 4 times. + + -- Serge Hallyn Mon, 06 Jun 2011 12:31:23 -0500 + multipath-tools (0.4.9-2) unstable; urgency=low * [2544655] wait harder for multipath init. Thanks to Serge Hallyn for @@ -185,6 +260,108 @@ -- Guido Günther Mon, 06 Apr 2009 19:36:25 +0200 +multipath-tools (0.4.8-14ubuntu11) oneiric; urgency=low + + * Fixes some return logic issues in the blacklist.c:_filter_path function + where using blacklist and blacklist_exceptions would cause multipathd to + improperly filter paths. (LP: #789229) + - The patch was created by Christophe Varoqui in 2007. + + http://www.redhat.com/archives/dm-devel/2007-November/msg00054.html + + 0013-libmultipath-filter_path-fix_blacklist_filter_exit.patch + - [serge-hallyn] swap in the whole upstream git commit and call it + 0013-blacklist_exception_issues.patch. + + -- Craig Magina Fri, 27 May 2011 11:47:19 -0400 + +multipath-tools (0.4.8-14ubuntu10) 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 Thu, 03 Feb 2011 18:40:36 -0600 + +multipath-tools (0.4.8-14ubuntu9) natty; urgency=low + + * Fix segv caused by race condition with free_waiter threads during + shutdown, using backport from upstream. (LP: #713237) + + -- dann frazier Thu, 03 Feb 2011 16:37:10 -0700 + +multipath-tools (0.4.8-14ubuntu8) natty; urgency=low + + * Fix segv on shutdown when log buffer is empty, using patch cherry-picked + from upstream. (LP: #488285) + + -- Serge Hallyn Tue, 01 Feb 2011 15:38:36 -0600 + +multipath-tools (0.4.8-14ubuntu7) natty; urgency=low + + * Add patch to fix the expected pathname from multipath uevents + (LP: #660597) + + -- Serge Hallyn Tue, 04 Jan 2011 16:06:29 -0600 + +multipath-tools (0.4.8-14ubuntu6) natty; urgency=low + + * Fix in debian/kpartx.udev: + - modprobe -q instead of incorrect modprobe -Q (LP: #644481) + + -- Serge Hallyn Tue, 04 Jan 2011 15:58:13 -0600 + +multipath-tools (0.4.8-14ubuntu5) natty; urgency=low + + * Make the initramfs local-top script wait until all devices + are mapped, to make sure no /dev/sd* get mounted before + multipath has a chance to take it. (LP: #686832) + + -- Serge Hallyn Tue, 04 Jan 2011 15:55:48 -0600 + +multipath-tools (0.4.8-14ubuntu4) lucid; urgency=low + + * debian/control: Move libreadline5-dev build dependency to libreadline-dev. + (Already done in Debian). + + -- Martin Pitt Mon, 08 Mar 2010 14:50:04 +0100 + +multipath-tools (0.4.8-14ubuntu3) lucid; urgency=low + + * Support failback for Intel Modular Server (LP: #520309). + + -- Colin Watson Fri, 12 Feb 2010 12:21:42 +0000 + +multipath-tools (0.4.8-14ubuntu2) jaunty; urgency=low + + * debian/kpartx.udev: Let dmsetup run kpartx, since $kernel doesn't map + right. + * debian/initramfs/hooks: Include /lib/udev/kpartx_id. + + -- Timo Aaltonen Tue, 10 Mar 2009 11:54:01 +0200 + +multipath-tools (0.4.8-14ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - control: + + Bump debhelper dependency to install udev rules to + /lib/udev/rules.d, bump udev dependencies as well. + + multipath-udeb must not depend on multipath-modules, + because the Ubuntu kernel already includes the modules and no + package provides m-m. + - initramfs/hooks: Install rules from /lib/udev/rules.d. + - kpartx.udev, multipath-tools-boot.init: + Replace multipath-tools-boot init script with udev rules. + - multipath-tools.preinst: Fix preinst script to modprobe dm-multipath. + This will make sure that multipathd will be able to start. + - multipath-tools.prerm: Add prerm script to not fail when upgrading + from a broken version of multipathd. + - patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd. + - rules: Move udev rules to priority 95, because rules that load + modules should be >90. + * Fix bugs (LP: #316851, #320156) + * multipath-tools.prerm/preinst: Remove checks for old ubuntu + versions, we don't support upgrading from them anymore. + + -- Timo Aaltonen Thu, 12 Feb 2009 15:07:42 +0200 + multipath-tools (0.4.8-14) unstable; urgency=low * [6dad4a0] kpartx: use uint64_t to account slices start/size based on @@ -247,6 +424,64 @@ -- Guido Guenther Wed, 30 Jul 2008 17:59:03 -0400 +multipath-tools (0.4.8-10ubuntu6) jaunty; urgency=low + + * debian/multipath-tools.preinst: Use the same logic as in + hw-detect to determine if dm_multipath is already loaded. + + -- Timo Aaltonen Thu, 15 Jan 2009 23:50:18 +0200 + +multipath-tools (0.4.8-10ubuntu5) jaunty; urgency=low + + * debian/initramfs/hooks: Install from /lib/udev/rules.d + + -- Scott James Remnant Tue, 13 Jan 2009 03:05:02 +0000 + +multipath-tools (0.4.8-10ubuntu4) jaunty; urgency=low + + * Bump debhelper dependency to install udev rules to /lib/udev/rules.d, + bump udev dependencies as well. + + -- Scott James Remnant Mon, 12 Jan 2009 22:03:11 +0000 + +multipath-tools (0.4.8-10ubuntu3) jaunty; urgency=low + + * fix_udev_scsi_id_arguments.diff: + Update the arguments for scsi_id. (LP: #306723) + * fix_sysfs_layout.diff: + Patch from upstream to use the new sysfs layout. (LP: #307032) + + -- Timo Aaltonen Thu, 18 Dec 2008 15:32:20 +0200 + +multipath-tools (0.4.8-10ubuntu2) jaunty; urgency=low + + * debian/control: multipath-udeb must not depend on multipath-modules, + because the Ubuntu kernel already includes the modules and no + package provides m-m. + * debian/multipath-tools.preinst: Don't modprobe dm-multipath + unconditionally, since it'll break during installation (no + modprobe.dep) and when using a monolithic kernel. Instead check for + these conditions. (LP: #182009) + + -- Timo Aaltonen Tue, 02 Dec 2008 12:28:08 +0200 + +multipath-tools (0.4.8-10ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Replace multipath-tools-boot init script with udev rules in + kpartx.rules. + - Move udev rules to priority 95, and drop call to dmsetup_env. + - Add devices as they appear + - Fix preinst script to modprobe dm-multipath. This will make sure + that multipathd will be able to start. + - Fix init script not to die on stop if multipathd is not running. + - Add prerm script to not fail when upgrading from a broken version of + multipathd. + - Set umask in multipathd. + - Handle udev rules priority change in preinst. + + -- Soren Hansen Thu, 26 Jun 2008 08:55:33 +0200 + multipath-tools (0.4.8-10) unstable; urgency=low * [183da2c] Add russion debconf translation (Closes: #486353) - thanks @@ -280,6 +515,32 @@ -- Guido Guenther Sun, 09 Mar 2008 18:55:38 +0100 +multipath-tools (0.4.8-7ubuntu2) hardy; urgency=low + + * Install udev rules in initramfs. + * Use temporary device name for creating partitions using kpartx. + * Big thanks to Dag Stenstad for testing and helping with debugging! + + -- Soren Hansen Wed, 19 Mar 2008 19:07:22 +0100 + +multipath-tools (0.4.8-7ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - DebianMaintainerField. + - Replace multipath-tools-boot init script with udev rules in + kpartx.rules. + - Move udev rules to priority 95, and drop call to dmsetup_env. + - Add devices as they appear. + - Fix preinst script to modprobe dm-multipath. This will make sure + that multipathd will be able to start. + - Add prerm script to not fail when upgrading from a broken version of + multipathd. + - Set umask in multipathd. + - Handle udev rules priority change in preinst. + * Dropped our hsg80 changes. Kernel handles this correctly now. + + -- Soren Hansen Mon, 28 Jan 2008 11:09:45 +0100 + multipath-tools (0.4.8-7) unstable; urgency=low * add watch file @@ -301,6 +562,26 @@ -- Guido Guenther Sat, 01 Dec 2007 15:41:36 +0100 +multipath-tools (0.4.8-5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - DebianMaintainerField. + - Suggest sg3-utils, Conflict with sg-utils. + - Replace multipath-tools-boot init script with udev rules in + kpartx.rules. + - Add /sbin/hsg80_start. + - Move udev rules to priority 95, and drop call to dmsetup_env. + - Add devices as they appear + - Fix preinst script to modprobe dm-multipath. This will make sure + that multipathd will be able to start. + - Fix init script not to die on stop if multipathd is not running. + - Add prerm script to not fail when upgrading from a broken version of + multipathd. + - Set umask in multipathd. + - Handle udev rules priority change in preinst. + + -- Soren Hansen Thu, 13 Dec 2007 03:03:31 +0100 + multipath-tools (0.4.8-5) unstable; urgency=low * apply kpartx-fix-udev-dmraid.diff to our shipped udev rules too @@ -415,6 +696,34 @@ -- Guido Guenther Fri, 08 Jun 2007 11:51:00 +0200 +multipath-tools (0.4.7-2ubuntu3) gutsy; urgency=low + + * Fix preinst script to modprobe dm-multipath. This will make sure + that multipathd will be able to start. + + * Fix init script not to die on stop if multipathd is not running. + + * Add prerm script to not fail when upgrading from a broken version of + multipathd. + + -- Fabio M. Di Nitto Fri, 10 Aug 2007 13:03:39 +0200 + +multipath-tools (0.4.7-2ubuntu2) gutsy; urgency=low + + * Fix udev rule to load dm-multipath. + + -- Fabio M. Di Nitto Wed, 13 Jun 2007 11:56:52 +0200 + +multipath-tools (0.4.7-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - Remove multipath-tools-boot init script in favour of udev rules. + - Update udev rules as described in 0.4.7-1.1ubuntu3. + - Add /sbin/hsg80_start as described in 0.4.7-1.1ubuntu3. + - debian/control Ubuntu maintainer foobar. + + -- Fabio M. Di Nitto Wed, 16 May 2007 11:02:20 +0200 + multipath-tools (0.4.7-2) unstable; urgency=low [ Bastian Blank ] @@ -432,6 +741,42 @@ -- Guido Guenther Wed, 20 Dec 2006 17:40:59 +0100 +multipath-tools (0.4.7-1.1ubuntu3) feisty; urgency=low + + * Remove multipath-tools-boot init script. + + * Wild changes and updates to udev rules: + - All the hsg80 MULTIBUS FAILOVER are now handled here. + - Fix rule to call kpartx also on "change" udev events. + - Invoke multipath -v 0 device to make sure we hot plug + all devices into multipath. + + * Add /sbin/hsg80_start that wraps all the work to make an hsg80 in + MULTIBUS FAILOVER working properly. + This is automatically called by udev. + + (Closes LP: #98518) + + -- Fabio M. Di Nitto Wed, 04 Apr 2007 08:17:48 +0200 + +multipath-tools (0.4.7-1.1ubuntu2) feisty; urgency=low + + * Remove devmap_name from this package, and Depend on dmsetup instead. + Fixes file overwrite conflict with dmsetup. (LP 84894.) + + -- Ian Jackson Tue, 13 Feb 2007 16:16:46 +0000 + +multipath-tools (0.4.7-1.1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - remove stop links from rc0 and rc6 + - suggest sg3-utils, conflict sg-utils + - fix path to scsi_id + - ubuntu udev rules + - set umask + + -- Scott James Remnant Tue, 28 Nov 2006 15:24:16 +0000 + multipath-tools (0.4.7-1.1) unstable; urgency=medium * Added missing dependency on dmsetup. Closes: #381068. @@ -444,6 +789,77 @@ -- John Goerzen Wed, 9 Aug 2006 11:52:08 -0500 +multipath-tools (0.4.7-1ubuntu8) edgy; urgency=low + + * Remove stop script symlinks from rc0 and rc6. + + -- Scott James Remnant Fri, 15 Sep 2006 17:30:19 +0100 + +multipath-tools (0.4.7-1ubuntu7) dapper; urgency=low + + * Fix typo in init script that was executing hsg80_init unconditionally. + + * Suggests: sg3-utils and Conflicts: sg-utils (obsoleted). + + -- Fabio M. Di Nitto Mon, 22 May 2006 09:56:07 +0200 + +multipath-tools (0.4.7-1ubuntu6) dapper; urgency=low + + * no changes upload to rebuild with new libdevmapper. + + -- Fabio M. Di Nitto Wed, 10 May 2006 09:31:20 +0200 + +multipath-tools (0.4.7-1ubuntu5) dapper; urgency=low + + The "give Scott a crying biscuit" release. + + * Apply patch from Dennis Kaarsemaker. + (Closes Ubuntu: #41318) + + -- Fabio M. Di Nitto Wed, 26 Apr 2006 10:20:07 +0200 + +multipath-tools (0.4.7-1ubuntu4) dapper; urgency=low + + * Remove 2 extra lines from multipath.rules that were really not supposed + to be there. + + -- Fabio M. Di Nitto Thu, 06 Apr 2006 17:43:10 +0200 + +multipath-tools (0.4.7-1ubuntu3) dapper; urgency=low + + * Add hsg80_init function to multipath-tools-boot init script. + The script takes care to perform a proper initialization of the disks + when the hsg80 is configured in multibus failover mode. + + NOTE: multipathd is not able to understand properly what happens in this + multi-bugs situation and it will require manual kill and restart once + the disks have been readded to the system, otherwise failover is not + guaranteed and syslog will be flooded. + + -- Fabio M. Di Nitto Thu, 06 Apr 2006 09:33:51 +0200 + +multipath-tools (0.4.7-1ubuntu2) dapper; urgency=low + + * Fix socket permissions. + + -- Fabio M. Di Nitto Tue, 04 Apr 2006 18:20:20 +0200 + +multipath-tools (0.4.7-1ubuntu1) dapper; urgency=low + + * Fix path to scsi_id. + + * Make install: target depends on build in debian/rules. + + * Change NAME to multipathd in init scripts so that we can actually stop + multipathd. + + * Swap multipath-tools-boot and multipath-tools init scripts order in + postinst and make multipath-tools-boot start. + + * UVF exception granted by Colin Watson. + + -- Fabio M. Di Nitto Tue, 04 Apr 2006 06:31:09 +0200 + multipath-tools (0.4.7-1) unstable; urgency=low * New upstream version. @@ -547,4 +963,3 @@ -- Patrick Caulfield Wed, 3 Nov 2004 10:16:34 +0000 - diff -Nru multipath-tools-0.4.9/debian/control multipath-tools-0.4.9/debian/control --- multipath-tools-0.4.9/debian/control 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/control 2013-01-30 00:55:25.000000000 +0000 @@ -1,9 +1,10 @@ Source: multipath-tools Section: admin Priority: extra -Maintainer: Debian LVM Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian LVM Team Uploaders: Guido Günther , Ritesh Raj Sarraf -Build-Depends: debhelper (>= 5.0.45), po-debconf, libdevmapper-dev (>= 2:1.02.20), libreadline-dev, libaio-dev +Build-Depends: debhelper (>= 7.0.17ubuntu2), po-debconf, libdevmapper-dev (>= 2:1.02.20), libreadline-dev, libaio-dev Vcs-Git: git://git.debian.org/git/pkg-lvm/multipath-tools.git Vcs-Browser: http://git.debian.org/?p=pkg-lvm/multipath-tools.git Standards-Version: 3.9.1 @@ -11,7 +12,7 @@ Package: multipath-tools Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>= 0.124), initscripts (>= 2.85-16), +Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 136-1), initscripts (>= 2.85-16), kpartx (>= ${binary:Version}), lsb-base (>= 3), libaio1 (>= 0.3.106-8) Conflicts: multipath-tools-initramfs (<= 1.0.1), multipath-tools-boot (<= 0.4.8+git0.761c66f-2~) @@ -38,16 +39,24 @@ Package: kpartx Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 0.086), dmsetup (>= 2:1.02.24) +Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 136-1), dmsetup (>= 2:1.02.24) Replaces: multipath-tools (<< 0.4.7-3) Description: create device mappings for partitions 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}), kpartx (<< ${source:Version}.1~) +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}), multipath-tools (<< ${source:Version}.1~), + kpartx-boot (= ${binary:Version}) Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1) Conflicts: multipath-tools-initramfs (<< 1.0.1+nmu1) Description: Support booting from multipath devices @@ -63,7 +72,7 @@ Package: multipath-udeb Package-Type: udeb Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, multipath-modules +Depends: ${shlibs:Depends}, ${misc:Depends}, multipath-modules, kpartx-udeb Section: debian-installer Description: maintain multipath block device access - udeb package This is a udeb, or a microdeb, for the debian-installer. @@ -71,3 +80,13 @@ These tools are in charge of maintaining the disk multipath device maps and react to path and map events. +Package: kpartx-udeb +Package-Type: udeb +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Section: debian-installer +Description: create device mappings for partitions - udeb package + This is a udeb, or a microdeb, for the debian-installer. + . + 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. diff -Nru multipath-tools-0.4.9/debian/initramfs/hooks multipath-tools-0.4.9/debian/initramfs/hooks --- multipath-tools-0.4.9/debian/initramfs/hooks 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/initramfs/hooks 2013-01-30 00:55:25.000000000 +0000 @@ -27,7 +27,7 @@ add_udev_rules() { - for rules in 60-multipath.rules 60-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/ @@ -51,4 +47,3 @@ for x in dm-multipath dm-round-robin dm-emc; do manual_add_modules ${x} done - diff -Nru multipath-tools-0.4.9/debian/initramfs/kpartx.hook multipath-tools-0.4.9/debian/initramfs/kpartx.hook --- multipath-tools-0.4.9/debian/initramfs/kpartx.hook 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/initramfs/kpartx.hook 2013-01-30 00:55:25.000000000 +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/ diff -Nru multipath-tools-0.4.9/debian/initramfs/local-top multipath-tools-0.4.9/debian/initramfs/local-top --- multipath-tools-0.4.9/debian/initramfs/local-top 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/initramfs/local-top 2013-01-30 00:55:25.000000000 +0000 @@ -42,6 +42,11 @@ done verbose && log_end_msg +# Sync waiting for storage. +verbose && log_begin_msg "Waiting for scsi storage" +{ rmmod scsi_wait_scan ; modprobe scsi_wait_scan ; rmmod scsi_wait_scan ; } >/dev/null 2>&1 +verbose && log_end_msg + verbose && log_begin_msg "Discovering multipaths" /sbin/multipath -v $VERBOSITY verbose && log_end_msg @@ -51,7 +56,7 @@ fi if [ -x /sbin/udevadm ]; then - /sbin/udevadm settle --timeout=10 + /sbin/udevadm settle fi maybe_break post-multipath diff -Nru multipath-tools-0.4.9/debian/kpartx-boot.postinst multipath-tools-0.4.9/debian/kpartx-boot.postinst --- multipath-tools-0.4.9/debian/kpartx-boot.postinst 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/kpartx-boot.postinst 2013-01-30 00:55:25.000000000 +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 + + diff -Nru multipath-tools-0.4.9/debian/kpartx-boot.postrm multipath-tools-0.4.9/debian/kpartx-boot.postrm --- multipath-tools-0.4.9/debian/kpartx-boot.postrm 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/kpartx-boot.postrm 2013-01-30 00:55:25.000000000 +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: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' +# +# 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 + + diff -Nru multipath-tools-0.4.9/debian/kpartx-udeb.install multipath-tools-0.4.9/debian/kpartx-udeb.install --- multipath-tools-0.4.9/debian/kpartx-udeb.install 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/kpartx-udeb.install 2013-01-30 00:55:25.000000000 +0000 @@ -0,0 +1 @@ +/sbin/kpartx diff -Nru multipath-tools-0.4.9/debian/kpartx.install multipath-tools-0.4.9/debian/kpartx.install --- multipath-tools-0.4.9/debian/kpartx.install 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/kpartx.install 2013-01-30 00:55:25.000000000 +0000 @@ -1,4 +1,4 @@ /usr/share/man/man8/kpartx.8.gz /sbin/kpartx -/lib/udev/kpartx_id -/lib/udev/dmsetup_env +/lib*/udev/kpartx_id +/lib*/udev/dmsetup_env diff -Nru multipath-tools-0.4.9/debian/kpartx.udev multipath-tools-0.4.9/debian/kpartx.udev --- multipath-tools-0.4.9/debian/kpartx.udev 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/kpartx.udev 2013-01-30 00:55:25.000000000 +0000 @@ -4,18 +4,23 @@ # and kpartx) have meaningful persistent device names # +# Always attempt to load dm-multipath. This way we can get rid of the +# init script. +ACTION=="add|change", SUBSYSTEM=="block", \ + RUN+="/sbin/modprobe -qba dm-multipath" + KERNEL!="dm-*", GOTO="kpartx_end" ACTION=="remove", GOTO="kpartx_end" # This is a temporary hack until Debian's dmsetup properly supports "dmsetup # export". For more information see: #434241, #487881, #493078 -IMPORT{program}="dmsetup_env %M %m" +IMPORT{program}="/lib/udev/dmsetup_env %M %m" ENV{DM_TABLE_STATE}!="LIVE", GOTO="kpartx_end" ENV{DM_UUID}=="?*", IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}" -OPTIONS="link_priority=50" +OPTIONS="link_priority=95" # Create persistent links for multipath tables ENV{DM_UUID}=="mpath-*", \ @@ -31,10 +36,8 @@ # Create dm tables for partitions ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \ - RUN+="/sbin/kpartx -a -p -part /dev/$name" + RUN+="/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p -part' -j %M -m %m" ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \ - RUN+="/sbin/kpartx -a -p -part /dev/$name" + RUN+="/sbin/kpartx -a -p -part /dev/$kernel" LABEL="kpartx_end" - - diff -Nru multipath-tools-0.4.9/debian/multipath-tools.install multipath-tools-0.4.9/debian/multipath-tools.install --- multipath-tools-0.4.9/debian/multipath-tools.install 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/multipath-tools.install 2013-01-30 00:55:25.000000000 +0000 @@ -1,4 +1,4 @@ /sbin/multi* -/lib/multipath/* -/lib/libmultipath.so.* +/lib*/multipath/* +/lib*/libmultipath.so.* /usr/share/man/man*/multi*gz diff -Nru multipath-tools-0.4.9/debian/multipath-tools.preinst multipath-tools-0.4.9/debian/multipath-tools.preinst --- multipath-tools-0.4.9/debian/multipath-tools.preinst 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/multipath-tools.preinst 2013-01-30 00:55:25.000000000 +0000 @@ -32,6 +32,10 @@ ;; esac +if ! dmsetup targets | cut -d' ' -f1 | grep -q '^multipath$'; then + modprobe -v dm-multipath || true +fi + #DEBHELPER# exit 0 diff -Nru multipath-tools-0.4.9/debian/multipath-udeb.install multipath-tools-0.4.9/debian/multipath-udeb.install --- multipath-tools-0.4.9/debian/multipath-udeb.install 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/multipath-udeb.install 2013-01-30 00:55:25.000000000 +0000 @@ -1,4 +1,3 @@ /sbin/multipath -/lib/multipath/ -/lib/libmultipath.so.* -/sbin/kpartx +/lib*/multipath/ +/lib*/libmultipath.so.* diff -Nru multipath-tools-0.4.9/debian/patches/0009-fix-delim.patch multipath-tools-0.4.9/debian/patches/0009-fix-delim.patch --- multipath-tools-0.4.9/debian/patches/0009-fix-delim.patch 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/patches/0009-fix-delim.patch 2013-01-30 00:55:25.000000000 +0000 @@ -0,0 +1,39 @@ +From: Phillip Susi +Subject: Don't add 'p' delimiter when you shouldn't +Description: The 'p' delimiter is supposed to be added when the + base disk name ends in a digit. This decision was based on the + name given on the command line, not the canonical device name, + so giving /dev/dm-0 instead of /dev/mapper/foo triggered the digit + test and added the 'p'. Changed test to use the canonical name + rather than the given name. + +Index: b/kpartx/kpartx.c +=================================================================== +--- a/kpartx/kpartx.c ++++ b/kpartx/kpartx.c +@@ -310,12 +310,6 @@ + device = loopdev; + } + +- if (delim == NULL) { +- delim = malloc(DELIM_SIZE); +- memset(delim, 0, DELIM_SIZE); +- set_delimiter(device, delim); +- } +- + off = find_devname_offset(device); + + if (!loopdev) { +@@ -331,6 +325,12 @@ + if (!mapname) + mapname = device + off; + ++ if (delim == NULL) { ++ delim = malloc(DELIM_SIZE); ++ memset(delim, 0, DELIM_SIZE); ++ set_delimiter(mapname, delim); ++ } ++ + fd = open(device, O_RDONLY); + + if (fd == -1) { diff -Nru multipath-tools-0.4.9/debian/patches/0010-fix-extended-partitions.patch multipath-tools-0.4.9/debian/patches/0010-fix-extended-partitions.patch --- multipath-tools-0.4.9/debian/patches/0010-fix-extended-partitions.patch 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/patches/0010-fix-extended-partitions.patch 2013-01-30 01:02:49.000000000 +0000 @@ -0,0 +1,47 @@ +From: Phillip Susi +Subject: fix extended partition mapping +Description: The linux kernel maps the extended partition only + so that LILO can be installed there. The length is always set + to two sectors to allow this, and most tools know to ignore the + device. kpartx was mapping the entire extended partition, then + stacking the logical partitions on top of it. This presented + a device that looked like an entirely separate disk that + contains only the logical partitions. This patch fixes kpartx + to conform with the normal Linux behavior. + +--- a/kpartx/dos.c ++++ b/kpartx/dos.c +@@ -98,6 +98,8 @@ + break; + } + if (is_extended(p.sys_type)) { ++ sp[i].size = 2; /* extended partitions only get two ++ sectors mapped for LILO to install */ + n += read_extended_partition(fd, &p, i, sp+n, ns-n); + } + } +--- a/kpartx/kpartx.c ++++ b/kpartx/kpartx.c +@@ -501,7 +501,6 @@ + d = c; + while (c) { + for (j = 0; j < n; j++) { +- uint64_t start; + int k = slices[j].container - 1; + + if (slices[j].size == 0) +@@ -527,11 +526,9 @@ + } + strip_slash(partname); + +- start = slices[j].start - slices[k].start; +- if (safe_sprintf(params, "%d:%d %" PRIu64, +- slices[k].major, +- slices[k].minor, +- start)) { ++ if (safe_sprintf(params, "%s %" PRIu64, ++ device, ++ slices[j].start)) { + fprintf(stderr, "params too small\n"); + exit(1); + } diff -Nru multipath-tools-0.4.9/debian/patches/1000--set-umask-in-multipathd.patch multipath-tools-0.4.9/debian/patches/1000--set-umask-in-multipathd.patch --- multipath-tools-0.4.9/debian/patches/1000--set-umask-in-multipathd.patch 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/patches/1000--set-umask-in-multipathd.patch 2013-01-30 00:55:25.000000000 +0000 @@ -0,0 +1,29 @@ +Index: multipath-tools-0.4.8-14ubuntu1/multipathd/uxlsnr.c +=================================================================== +--- multipath-tools-0.4.8-14ubuntu1.orig/multipathd/uxlsnr.c 2009-02-12 16:03:36.166109941 +0200 ++++ multipath-tools-0.4.8-14ubuntu1/multipathd/uxlsnr.c 2009-02-12 16:04:44.842624340 +0200 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include + +@@ -93,11 +94,16 @@ + int ux_sock; + size_t len; + int rlen; ++ mode_t mask; + char *inbuf; + char *reply; + ++ mask=umask(0177); ++ + ux_sock = ux_socket_listen(DEFAULT_SOCKET); + ++ umask(mask); ++ + if (ux_sock == -1) { + condlog(0, "ux_socket_listen error"); + exit(1); diff -Nru multipath-tools-0.4.9/debian/patches/1001--fix-linking-command.patch multipath-tools-0.4.9/debian/patches/1001--fix-linking-command.patch --- multipath-tools-0.4.9/debian/patches/1001--fix-linking-command.patch 1970-01-01 00:00:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/patches/1001--fix-linking-command.patch 2013-01-30 00:55:25.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Specify LDFLAGS after objects + Otherwise linking fails. Not (yet) sent upstream, may be + specific to Ubuntu toolchain since someone otherwise surely + would have noticed failure to build. + +Index: multipath-tools-merge/multipathd/Makefile +=================================================================== +--- multipath-tools-merge.orig/multipathd/Makefile 2011-01-25 11:33:21.479274000 -0600 ++++ multipath-tools-merge/multipathd/Makefile 2011-01-25 13:14:42.278463101 -0600 +@@ -28,7 +28,7 @@ + all : $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) ++ $(CC) $(CFLAGS) -o $(EXEC) $(OBJS) $(LDFLAGS) + $(GZIP) $(EXEC).8 > $(EXEC).8.gz + + install: diff -Nru multipath-tools-0.4.9/debian/patches/series multipath-tools-0.4.9/debian/patches/series --- multipath-tools-0.4.9/debian/patches/series 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/patches/series 2013-01-30 01:02:49.000000000 +0000 @@ -6,3 +6,7 @@ 0006-read-only-partition-mappings-manpage.patch 0007-do-not-link-against-ncurses.patch 0008-kpartx-example-manpage.patch +1000--set-umask-in-multipathd.patch +1001--fix-linking-command.patch +0009-fix-delim.patch +0010-fix-extended-partitions.patch diff -Nru multipath-tools-0.4.9/debian/rules multipath-tools-0.4.9/debian/rules --- multipath-tools-0.4.9/debian/rules 2011-12-03 14:24:00.000000000 +0000 +++ multipath-tools-0.4.9/debian/rules 2013-01-30 00:55:25.000000000 +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: @@ -67,8 +68,8 @@ dh_installexamples dh_installinit -pmultipath-tools dh_installinit -pmultipath-tools --name=multipath-tools-boot --no-start -- start 21 S . - dh_installudev -pkpartx - dh_installudev -pmultipath-tools --name=multipath + dh_installudev -pkpartx --priority=95 + dh_installudev -pmultipath-tools --name=multipath --priority=95 dh_installdebconf -pmultipath-tools-boot dh_installman dh_makeshlibs --add-udeb=multipath-udeb