diff -Nru multipath-tools-0.4.7/debian/changelog multipath-tools-0.4.7/debian/changelog --- multipath-tools-0.4.7/debian/changelog 2007-03-23 00:28:49.000000000 +0100 +++ multipath-tools-0.4.7/debian/changelog 2007-03-23 00:28:50.000000000 +0100 @@ -1,3 +1,20 @@ +multipath-tools (0.4.7-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - suggest sg3-utils, conflict sg-utils + - set umask + - remove devmap_name + - update maintainer field in debian/control + Removed changes, now in Debian: + - remove stop links from rc0 and rc6 + - fix path to scsi_id + - ubuntu udev rules + - hsg80_init function + - typo in init script + - debian/multipath-tools.* changes + + -- Luca Falavigna Fri, 16 Feb 2007 00:25:35 +0000 + multipath-tools (0.4.7-2) unstable; urgency=low [ Bastian Blank ] @@ -15,6 +32,24 @@ -- Guido Guenther Wed, 20 Dec 2006 17:40:59 +0100 +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. @@ -27,6 +62,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. @@ -130,4 +236,3 @@ -- Patrick Caulfield Wed, 3 Nov 2004 10:16:34 +0000 - diff -Nru multipath-tools-0.4.7/debian/control multipath-tools-0.4.7/debian/control --- multipath-tools-0.4.7/debian/control 2007-03-23 00:28:49.000000000 +0100 +++ multipath-tools-0.4.7/debian/control 2007-03-23 00:28:50.000000000 +0100 @@ -1,14 +1,17 @@ Source: multipath-tools Section: admin Priority: extra -Maintainer: Debian LVM Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian LVM Team Uploaders: Guido Guenther Build-Depends: debhelper (>> 4.0.0), po-debconf, libdevmapper-dev (>= 2:1.01.0), libsysfs-dev, libreadline5-dev, quilt (>= 0.40) Standards-Version: 3.7.2 Package: multipath-tools Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 0.086), initscripts (>= 2.85-16), dmsetup +Suggests: sg3-utils +Conflicts: sg-utils +Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>> 0.070), initscripts (>= 2.85-16), dmsetup, sysv-rc (>= 2.86.ds1-14.1ubuntu2) Description: Command-line utilities for administering multipath disk access These tools are in charge of maintaining the disk multipath device maps and react to path and map events. diff -Nru multipath-tools-0.4.7/debian/multipath-tools.manpages multipath-tools-0.4.7/debian/multipath-tools.manpages --- multipath-tools-0.4.7/debian/multipath-tools.manpages 2007-03-23 00:28:49.000000000 +0100 +++ multipath-tools-0.4.7/debian/multipath-tools.manpages 2007-03-23 00:28:50.000000000 +0100 @@ -1,4 +1,3 @@ -devmap_name/devmap_name.8 kpartx/kpartx.8 multipathd/multipathd.8 multipath/multipath.8 diff -Nru multipath-tools-0.4.7/multipathd/uxlsnr.c multipath-tools-0.4.7/multipathd/uxlsnr.c --- multipath-tools-0.4.7/multipathd/uxlsnr.c 2006-03-13 16:12:08.000000000 +0100 +++ multipath-tools-0.4.7/multipathd/uxlsnr.c 2007-03-23 00:28:50.000000000 +0100 @@ -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);