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

[Serge Hallyn]

This is essentially just a sync of the debian experimental multipath-tools package.

[Colin Watson (cjwatson)]

This entire branch really needs to be constructed based on lp:debian/experimental/multipath-tools, I think - otherwise the bzr toolset doesn't work in a particularly friendly fashion. For example, it will be unnecessarily difficult to merge changes in future. Can you please replay your changes on top of that? (In fact, it would be best if you started with the existing lp:ubuntu/multipath-tools and then used 'bzr merge-package lp:debian/experimental/multipath-tools'.)

Regarding the actual changes:

 * Maintainer is out of date - the current standard is "Ubuntu Developers <email address hidden>" (nitpick).
 * Please describe the remaining Ubuntu changes in debian/changelog, and preserve all the old Ubuntu debian/changelog entries since you're performing a merge here and that history is valuable; I shouldn't have to dig out the changelog from 0.4.8-14ubuntu1 (no longer in your package) to find out why various deltas from Debian exist. See the existing package in natty for an example.

review: Needs Fixing

[Serge Hallyn (serge-hallyn)]

Quoting Colin Watson (<email address hidden>):
> Review: Needs Fixing

Thanks for the review, Colin.

> This entire branch really needs to be constructed based on lp:debian/experimental/multipath-tools,

Great, I didn't know that existed :) I'll base it on that.

> I think - otherwise the bzr toolset doesn't work in a particularly friendly fashion. For example, it will be unnecessarily difficult to merge changes in future. Can you please replay your changes on top of that? (In fact, it would be best if you started with the existing lp:ubuntu/multipath-tools and then used 'bzr merge-package lp:debian/experimental/multipath-tools'.)
>

This sounds like a bad idea in principle. We have a base tree in the
debian branch, which we have forked off to make changes which were
later applied upstream and from there to the debian tree. Merging
our own tree back in to then hand-undo those changes (which are each
parts of commits which we don't want to drop entirely) seems dirty
and duplicative of the effort already spent identifying each of the
differences we do and don't want to keep. If each change was really
a separate commit in the origianl tree it might be not as bad, but even
then it still seems to be abusing a rebase to pretend that we've
actually not rebased.

In order to come up with anything reasonable, I'd have to
merge lp:ubuntu/multipath-tools in one revision at a time (akin
to a git rebase with each commit changed to an 'edit').

So I prefer to just base it on lp:debian/experimental/multipath-tools.

> Regarding the actual changes:
>
> * Maintainer is out of date - the current standard is "Ubuntu Developers <email address hidden>" (nitpick).
> * Please describe the remaining Ubuntu changes in debian/changelog, and preserve all the old Ubuntu debian/changelog entries since you're performing a merge here and that history is valuable; I shouldn't have to dig out the changelog from 0.4.8-14ubuntu1 (no longer in your package) to find out why various deltas from Debian exist. See the existing package in natty for an example.

Will do, thanks

-serge

[Colin Watson (cjwatson)]

On Wed, Jan 05, 2011 at 07:46:53PM -0000, Serge Hallyn wrote:
> This sounds like a bad idea in principle.

Lots of other Ubuntu developers maintain packages like this, at many
different scales of complexity. It's pretty much the standard approach
for packages maintained in bzr (though the merge source varies).

I realise that the Linux kernel approach is to rebase, but this is not
usual for most userspace packages; we merge, and don't worry about there
being a "clean" commit series corresponding to each of our changes.
Management of a queue of changes to be sent upstream is typically
handled by patches in debian/patches/ instead, allowing comments on each
change to be easily visible by people who download the source package.

> In order to come up with anything reasonable, I'd have to
> merge lp:ubuntu/multipath-tools in one revision at a time (akin
> to a git rebase with each commit changed to an 'edit').
>
> So I prefer to just base it on lp:debian/experimental/multipath-tools.

This will at least not break tools (i.e. it'll be possible to do a merge
later, or even a rebase), so I would be OK with sponsoring a package
built that way. However, I do think it would be worth you getting used
to the way most Ubuntu developers maintain packages in bzr; if only
because if you're cooperating on a package with somebody else then they
will probably be most annoyed if you rebase on them. :-)

[Serge Hallyn (serge-hallyn)]

Quoting Colin Watson (<email address hidden>):
> > So I prefer to just base it on lp:debian/experimental/multipath-tools.
>
> This will at least not break tools (i.e. it'll be possible to do a merge
> later, or even a rebase), so I would be OK with sponsoring a package
> built that way. However, I do think it would be worth you getting used
> to the way most Ubuntu developers maintain packages in bzr; if only
> because if you're cooperating on a package with somebody else then they
> will probably be most annoyed if you rebase on them. :-)

Ok, I'll do that then.

thanks,
-serge

Unmerged revisions

9. By Serge Hallyn on 2010-12-22

debian/patches/1001--fix-linking-command.patch
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.

8. By Serge Hallyn on 2010-12-22

Sync remaining differences in debian/control from Ubuntu version

7. By Serge Hallyn on 2010-12-22

Merge in changes from Ubuntu's initramfs/hooks

6. By Serge Hallyn on 2010-12-22

Old commit (ubuntu-specific): debian/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.

5. By Serge Hallyn on 2010-12-22

Old commit: rules: Move udev rules to priority 95, because rules that load
modules should be >90.

4. By Serge Hallyn on 2010-12-22

Old commit: patches/1000--set-umask-in-multipathd.patch: Set umask in multipathd.

3. By Serge Hallyn on 2010-12-22

Old commit: multipath-tools.preinst: Fix preinst script to modprobe dm-multipath.
This will make sure that multipathd will be able to start.

2. By Serge Hallyn on 2010-12-22

Apply old ubuntu-specific commit:

kpartx.udev, multipath-tools-boot.init:
 Replace multipath-tools-boot init script with udev rules.

1. By Serge Hallyn on 2010-12-22

New multipath tree based on Debian experimental

I'll add ubuntu-specific fixes I think we need here, one tiny
revision at a time.

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2011-01-04 21:28:57 +0000
@@ -0,0 +1,10 @@
+*.o
+.dotest
+*~
+*.so
+*.so.0
+*.a
+*.gz
+kpartx
+multipath
+multipathd

=== added file 'AUTHOR'
--- AUTHOR	1970-01-01 00:00:00 +0000
+++ AUTHOR	2011-01-04 21:28:57 +0000
@@ -0,0 +1,1 @@
+Christophe Varoqui, <[e-mail]>

=== renamed file 'AUTHOR' => 'AUTHOR.moved'
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2011-01-04 21:28:57 +0000
@@ -0,0 +1,483 @@
+
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+

+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+

+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+

+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+

+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+

+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+

+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+

+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+

+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+     Appendix: How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+    MA 02111-1307, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'ChangeLog'
--- ChangeLog	1970-01-01 00:00:00 +0000
+++ ChangeLog	2011-01-04 21:28:57 +0000
@@ -0,0 +1,6 @@
+Change logs are at :
+
+- pre-0.4.5
+  http://christophe.varoqui.free.fr/wiki/wakka.php?wiki=ChangeLog
+- post-0.4.5
+  http://www.kernel.org/git/gitweb.cgi?p=linux/storage/multipath-tools/.git;a=log

=== renamed file 'ChangeLog' => 'ChangeLog.moved'
=== added file 'FAQ'
--- FAQ	1970-01-01 00:00:00 +0000
+++ FAQ	2011-01-04 21:28:57 +0000
@@ -0,0 +1,97 @@
+More at http://christophe.varoqui.free.fr/faq.html
+See also http://christophe.varoqui.free.fr/usage.html
+
+1. How to set up System-on-multipath ?
+======================================
+
+prerequisite : udev and multipath-tools installed
+
+here are the steps on a Debian SID system :
+
+* add dm-mpath and dm-multipath to /etc/mkinitrd/modules
+* copy $tools_dir/multipath/0[12]_* to /etc/mkinitrd/scripts
+* define a friendly alias for your multipathed root disk
+  (in /etc/multipath.conf). Example : "system"
+* enable busybox in /etc/mkinitrd/mkinitrd.conf and set ROOT
+  to any valid block-device (but not a /dev/dm-* one, due to
+  an mkintrd misbelief that all dm-* are managed by LVM2)
+* run mkinitrd
+* in /boot/grub/menu.lst, define the root= kernel parameter
+  Example : root=/dev/system1
+* modify /etc/fstab to reference /dev/system* partitions
+
+At reboot, you should see some info like :
+
+path /dev/sda : multipath system
+...
+gpt: 0 slices
+dos: 5 slices
+reduced size of partition #2 to 63
+Added system1 : 0 70685937 linear /dev/system 63
+Added system2 : 0 63 linear /dev/system 7068600
+Added system5 : 0 995967 linear /dev/system 70686063
+...
+
+2. How does it compare to commercial product XXX ?
+==================================================
+
+Here are a few distinctive features :
+
+* you can mix HBA models, even different vendors, different speed ...
+* you can mix storage controllers on your SAN, and access them all, applying
+  different path grouping policy
+* completely event-driven model : no administration burden if you accept the
+  default behaviours
+* extensible : you can plug your own policies if the available ones don't fill
+  your needs
+* supports root FS on multipathed SAN
+* free, open-source software
+
+3. LVM2 doesn't see my multipathed devices as PV, what's up ?
+=============================================================
+
+By default, lvm2 does not consider device-mapper block devices (such as a
+dm-crypt device) for use as physical volumes.
+
+In order to use a dm-crypt device as an lvm2 pv, add this line to the
+devices block in /etc/lvm/lvm.conf:
+
+types = [ "device-mapper", 16 ]
+
+If /etc/lvm/lvm.conf does not exist, you can create one based on your 
+current/default config like so:
+
+lvm dumpconfig > /etc/lvm/lvm.conf
+
+(tip from Christophe Saout)
+
+4. I see a lot of "io_setup failed" message using the directio checker
+======================================================================
+
+The directio path checker makes use of the asynchronous I/O API (aio) provided
+by modern Linux systems. Asynchronous I/O allows an application to submit I/O
+requests asynchronously and be notified later of their completion status. To
+allow this, we must allocate an asynchronous I/O context (an object of type
+aio_context_t) and this task is handled by the io_setup system call.
+
+A system wide limit on the number of AIO contexts that may be active
+simultaneously is imposed via the aio-max-nr sysctl parameter.
+
+Once this limit has been reached further calls to io_setup will fail with the
+error number EAGAIN leading to the "io_setup failed" messages seen for e.g. when
+running "multipath -ll".
+
+To avoid this problem the number of available aio contexts should be increased
+by setting the aio-max-nr parameter. This can be set on a one-time basis via the
+/proc file system, for e.g.:
+
+        # echo 131072 > /proc/sys/fs/aio-max-nr
+
+Doubles the number of available contexts from the default value of 65536.
+
+To make this setting persistent a line may be added to /etc/sysctl.conf:
+
+        fs.aio-max-nr = 131072
+
+Consult appropriate application and operating system tuning recommendations for
+guidance on appropriate values for this parameter.

=== renamed file 'FAQ' => 'FAQ.moved'
=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2011-01-04 21:28:57 +0000
@@ -0,0 +1,72 @@
+# Makefile
+#
+# Copyright (C) 2003 Christophe Varoqui, <[e-mail]>
+#
+
+#
+# Try to supply the linux kernel headers.
+#
+ifeq    ($(KRNLSRC),)
+KRNLLIB = /lib/modules/$(shell uname -r)
+ifeq    ($(shell test -r $(KRNLLIB)/source && echo 1),1)
+KRNLSRC = $(KRNLLIB)/source
+KRNLOBJ = $(KRNLLIB)/build
+else
+KRNLSRC = $(KRNLLIB)/build
+KRNLOBJ = $(KRNLLIB)/build
+endif
+endif
+export KRNLSRC
+export KRNLOBJ
+
+BUILDDIRS = \
+	libmultipath \
+	libmultipath/prioritizers \
+	libmultipath/checkers \
+	multipath \
+	multipathd \
+	kpartx
+
+ifeq   ($(MULTIPATH_VERSION),)
+VERSION = $(shell basename ${PWD} | cut -d'-' -f3)
+else
+VERSION = $(MULTIPATH_VERSION)
+endif
+
+all: recurse
+
+recurse:
+	@for dir in $(BUILDDIRS); do \
+	$(MAKE) -C $$dir BUILD=$(BUILD) VERSION=$(VERSION) \
+		KRNLSRC=$(KRNLSRC) KRNLOBJ=$(KRNLOBJ) || exit $?; \
+	done
+
+recurse_clean:
+	@for dir in $(BUILDDIRS); do \
+	$(MAKE) -C $$dir clean || exit $?; \
+	done
+
+recurse_install:
+	@for dir in $(BUILDDIRS); do \
+	$(MAKE) -C $$dir install || exit $?; \
+	done
+
+recurse_uninstall:
+	@for dir in $(BUILDDIRS); do \
+	$(MAKE) -C $$dir uninstall || exit $?; \
+	done
+
+clean:	recurse_clean
+	rm -f multipath-tools.spec
+	rm -rf rpms
+
+install:	recurse_install
+
+uninstall:	recurse_uninstall
+
+release:
+	sed -e "s/__VERSION__/${VERSION}/" \
+	multipath-tools.spec.in > multipath-tools.spec
+
+rpm: release
+	rpmbuild -bb multipath-tools.spec

=== added file 'Makefile.inc'
--- Makefile.inc	1970-01-01 00:00:00 +0000
+++ Makefile.inc	2011-01-04 21:28:57 +0000
@@ -0,0 +1,44 @@
+# Makefile.inc
+#
+# Copyright (C) 2004 Christophe Varoqui, <[e-mail]>
+
+#
+# Allow to force some libraries to be used statically. (Uncomment one of the
+# following lines or define the values when calling make.)
+#
+# WITH_LOCAL_LIBDM	= 1
+# WITH_LOCAL_LIBSYSFS	= 1
+
+ifeq ($(TOPDIR),)
+	TOPDIR	= ..
+endif
+
+ifndef LIB
+	ifeq ($(shell test -d /lib64 && echo 1),1)
+		LIB=lib64
+	else
+		LIB=lib
+	endif
+endif
+
+prefix      = 
+exec_prefix = $(prefix)
+bindir      = $(exec_prefix)/sbin
+libudevdir  = ${prefix}/lib/udev
+multipathdir = $(TOPDIR)/libmultipath
+mandir      = $(prefix)/usr/share/man/man8
+man5dir     = $(prefix)/usr/share/man/man5
+rcdir	    = $(prefix)/etc/init.d
+syslibdir   = $(prefix)/$(LIB)
+libdir	    = $(prefix)/$(LIB)/multipath
+
+GZIP        = /bin/gzip -9 -c
+INSTALL_PROGRAM = install
+
+OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
+CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
+SHARED_FLAGS = -shared
+
+%.o:	%.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+

=== renamed file 'Makefile.inc' => 'Makefile.inc.moved'
=== renamed file 'Makefile' => 'Makefile.moved'
=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2011-01-04 21:28:57 +0000
@@ -0,0 +1,1 @@
+Things to read

=== renamed file 'README' => 'README.moved'
=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2011-01-04 21:28:57 +0000
@@ -0,0 +1,1 @@
+Things to do

=== renamed file 'TODO' => 'TODO.moved'
=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/NEWS'
--- debian/NEWS	1970-01-01 00:00:00 +0000
+++ debian/NEWS	2011-01-04 21:28:57 +0000
@@ -0,0 +1,21 @@
+multipath-tools (0.4.7-2) unstable; urgency=low
+
+  udev, which provides scsi_id, moved the binary to /lib/udev.
+  The old name will stop working in the future.
+  
+  The default config now uses /lib/udev/scsi_id. And you have to
+  update /etc/multipath.conf by hand to reflect the new location.
+
+ -- Bastian Blank <[e-mail]>  Wed, 29 Mar 2006 12:08:32 +0200
+
+multipath-tools (0.4.5-1) unstable; urgency=low
+
+  This version removes creation of devices via udev in /dev. All
+  device-mapper devices are created by libdevmapper in /dev/mapper.
+
+  To readd the creation of devices in /dev, add the following line to
+  the udev rules (e.g. /etc/udev/rules.d/multipath.rules):
+  KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c", OPTIONS+="last_rule"
+
+ -- Bastian Blank <[e-mail]>  Mon, 19 Sep 2005 15:03:31 +0200
+

=== added file 'debian/README.source'
--- debian/README.source	1970-01-01 00:00:00 +0000
+++ debian/README.source	2011-01-04 21:28:57 +0000
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.

=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2011-01-04 21:28:57 +0000
@@ -0,0 +1,526 @@
+multipath-tools (0.4.9-1ubuntu1) natty; urgency=low
+
+  * Import from Debian upstream
+  * Ensure that multipath has setup all its paths before we proceed
+    with mountroot.  Otherwise, either root or some other device
+    could get mounted by it's block device, after which multipath
+    can't take it.
+
+ -- Serge Hallyn <[e-mail]>  Tue, 21 Dec 2010 16:47:34 -0600
+
+multipath-tools (0.4.9-1) experimental; urgency=low
+
+  * New upstream version 0.4.9 (Closes: #587315, #595127)
+  * [500e341] Don't fail "mulitipath-tools start" if multipathd is
+    already running (Closes: #587678)
+  * [f4e697c] Drop upstream patches:
+      * 0001-Fix-udev-rules-for-dmraid.patch
+      * 0003-fix-URL-to-FAQ.patch
+      * 0004-check-header-file-for-defintion-of-dm_task_no_flush.patch
+      * 0005-set-a-soname.patch
+      * 0006-add-library-dependencies.patch
+      * 0007-multipath-tools-rdac-path-checked-leads-to-I-O-hang-.patch
+      * 0010-Dots-are-special-in-groff.patch
+      * 0011-multipath-fix-offset-for-containted-slices.patch
+  * [678dcb6] Bindings file moved to /etc/multipath
+  * [ac2f9d5] Bump standards version
+  * [baea3a2] Add upstream homepage
+  * [9daa1b8] Remove /usr from $PATH so lintian doesn't assume we're
+    calling scripts from $remove_fs.
+  * [1a3c85e] Update po files
+
+ -- Guido Günther <[e-mail]>  Wed, 01 Sep 2010 15:10:26 +0200
+
+multipath-tools (0.4.8+git0.761c66f-9) unstable; urgency=low
+
+  * [0435cc1] Make sure the patchcheckers end up in /lib (Closes: #581377)
+  * [858f733] New patch 0011-multipath-fix-offset-for-containted- slices.patch
+    multipath: fix offset for containted slices. (Closes: #586104) - thanks to
+    Benjamin Marzinski
+
+ -- Guido Günther <[e-mail]>  Wed, 16 Jun 2010 20:02:47 +0200
+
+multipath-tools (0.4.8+git0.761c66f-8) unstable; urgency=low
+
+  * [16268d8] Drop path from dmsetup_env call - thanks to Ferenc Wagner
+  * [2f3bdd5] Use $name in multipath.udev as well - thanks to Ferenc Wagner
+    for testing
+  * [c978487] Don't pass -g on mips(el) to work around a binutils bug.  See
+    http://sources.redhat.com/bugzilla/show_bug.cgi?id=10144 for details.
+  * [9daf438] Make sure we discover multipaths before checkfs/mountall runs
+    This covers the cornercase where e.g. /home is on multipath (but not on
+    LVM) and multipath-tols aren't started via initramfs. (Closes: #577172)
+  * [f7cc840] Bump standards version
+
+ -- Guido Günther <[e-mail]>  Sun, 11 Apr 2010 13:22:35 +0200
+
+multipath-tools (0.4.8+git0.761c66f-7) unstable; urgency=low
+
+  * [13f7436] Properly add multipath-udeb to dh_makeshlibs (Closes: #564489) -
+    thanks to again Frans Pop
+
+ -- Guido Günther <[e-mail]>  Sat, 23 Jan 2010 00:14:04 +0100
+
+multipath-tools (0.4.8+git0.761c66f-6) unstable; urgency=low
+
+  * [5b0c7be] Fix dependency on nonexistent multipath-tools udeb (Closes:
+    #564489) - thanks to Frans Pop
+  * [c2a06f7] New patch debian/patches/0010-Dots-are-special-in- groff.patch
+    Dots are special in groff
+
+ -- Guido Günther <[e-mail]>  Sun, 10 Jan 2010 18:10:05 +0100
+
+multipath-tools (0.4.8+git0.761c66f-5) unstable; urgency=low
+
+  * [9c68527] Explicitly include posix_types.h to get the correct type for
+    __kernel_old_dev_t (Closes: #558990)
+
+ -- Guido Günther <[e-mail]>  Sat, 05 Dec 2009 18:14:05 +0100
+
+multipath-tools (0.4.8+git0.761c66f-4) unstable; urgency=low
+
+  * [eb7bcf2] Add kpartx_id to initramfs for persistent partition links.
+  * [7ecd444] Use $name instead of $kernel since 2.6.31 doesn't create
+    /dev/dm-* anymore.
+
+ -- Guido Günther <[e-mail]>  Sat, 21 Nov 2009 21:11:31 +0100
+
+multipath-tools (0.4.8+git0.761c66f-3) unstable; urgency=low
+
+  * upload to unstable
+  * [f62b619] Tighten multipath-tools-boot dependency Older versions might not
+    be able to cope with renamed patch checkers, etc.
+  * [7bb23db] Add udev rules to initramfs This makes the initramfs properly
+    event based. Once #455979 is fixed in LVM, root on lvm on multipatph can
+    work reliably. (Closes: #539498)
+  * [d9fcc80] Another init script dependency fix (Closes: #542370) - thanks to
+    Petter Reinholdtsen
+  * [3faab35] redo patches
+  * [c903696] Make user_friendly_names compatible to multipath-tools 0.4.8 and
+    earlier
+
+ -- Guido Günther <[e-mail]>  Sat, 21 Nov 2009 18:04:07 +0100
+
+multipath-tools (0.4.8+git0.761c66f-2) experimental; urgency=low
+
+  * [34758f1] don't install files into /lib64 on 64 bit architectures - thanks
+    to Pascal de Bruijn
+  * [2b0a3da] use libreadline-dev (Closes: #553813)
+  * [8394b3a] cherry-pick 362d2e5f215894818b52a0d03b723b75917390fb (Closes:
+    #555901)
+
+ -- Guido Günther <[e-mail]>  Thu, 12 Nov 2009 17:35:28 +0100
+
+multipath-tools (0.4.8+git0.761c66f-1) experimental; urgency=low
+
+  * upload current git snapshot to experimental
+  * [71c9c74] warn about user_friendly_names and suggest using /dev/disk/by-id/
+  * [329762e] increase locking timeout on bindings file to 30 secs - thanks to
+    Ritesh Raj Sarraf for the patch
+  * [759ad9b] add spanish translation (Closes: #528972) - thanks to Fernando
+    González de Requena
+  * [7c327fa] add Czech translation (Closes: #533524) - thanks to Tomas Fidler
+  * [49c78ba] drop patches merged upstream:
+        * 0001-get-rid-of-arch-specific-ifdef-spaghettis.patch
+        * 0002--libmultipath-filter_wwid-is-called-with-the-wron.patch
+        * 0004--kpartx-fix-extended-partition-handling.patch
+        * 0005--kpartx-remove-partitions-in-reverse-order.patch
+        * 0006--kpartx-documentation-fixes.patch
+        * 0007--kpartx-remove-dead-code.patch
+        * 0008-udev-as-of-0.124-doesn-t-support-scsi_id-s-anymor.patch
+        * 0011--kpartx-use-uint64_t-to-account-slices-start-size.patch
+        * 0012--libmultipath-Update-discovery-to-work-with-new-sys.patch
+        * 0013-multipathd-crash-on-shutdown.patch
+        * 0014--var-run-multipathd.sock-is-world-writable.patch
+        * 0015-Increase-timeout-to-30-secs-to-avoid-locking-issue.patch
+  * [52b5373] checkers and prio callouts are now SOs
+  * [e493cde] debian/rules: use --fail-missing
+  * [b1c5baf] devmap_name is no more
+  * [fd41e76] bump standards version
+  * [82dc3df] drop iscsi to work around #542370
+  * [cce7640] new patch:
+    0004-check-header-file-for-defintion-of-dm_task_no_flush: check the header
+    file for dm_task_no_flush instead
+    of one of the installed libs.
+  * [876a5fb] new patch: 0005-set-a-soname.patch add a soname to libmultipath
+  * [1912767] new patch 0006-add-library-dependencies.patch add libraries to
+    the linker call
+  * [4d1b506] add dh_makeshlibs call
+  * [1ee06d5] install lib with soname
+
+ -- Guido Günther <[e-mail]>  Sun, 30 Aug 2009 15:53:24 +0200
+
+multipath-tools (0.4.8-15) unstable; urgency=low
+
+  * [e3fdd6f] add iscsi as a prereq and add verbose logic from mdadm.
+  * [9299e3d] On shutdown multipathd flushes its internal message queue
+    but we have to check if the messages on the queue are not empty.
+    (Closes: #519252)
+  * [df5ee21] fix umask of multipathd socket (CVE-2009-0115). Upstream
+    commit 0a0319d381249760c71023edbe0ac9c093bb4a74. (Closes: #522813)
+
+ -- Guido Günther <[e-mail]>  Mon, 06 Apr 2009 19:36:25 +0200
+
+multipath-tools (0.4.8-14) unstable; urgency=low
+
+  * [6dad4a0] kpartx: use uint64_t to account slices start/size based on
+    65d108fbe. Fixes handling of devices >2TB.
+    (Closes: #512601) - thanks to Vincent McIntyre for testing
+  * [1fe965c] fix failure to gather block device information. Cherry-pick
+    88f88d from upstream: With the new sysfs layout the parent device of a
+    block device is 'block', and only the parent of this is the 'real' parent.
+    Fixes problems on kernels >= 2.6.27.
+    (LP: #307032) - thanks to Jens Langner for forwarding this.
+  * [85c6d6e] README.Debian: explain howto best access multipath devices
+    (Closes: #510911) - thanks to Vincent McIntyre
+  * [a2bf65e] FAQ: fix URL to FAQ - thanks to Vincent McIntyre
+  * [e65a06d] README.Debian: doc typo
+  * [a1de95f] add ja debconf translation
+    (Closes: #512857) - thanks to Hideki Yamane
+  * [8400b79] rules: drop redo-patches target handled via external script now
+  * [50eb583] control: fix maintainer name
+  * [fe7e471] drop superflous headers and footers of patches, no functional
+    changes
+
+ -- Guido Günther <[e-mail]>  Thu, 29 Jan 2009 10:17:36 +0100
+
+multipath-tools (0.4.8-13) unstable; urgency=low
+
+  [ Guido Günther ]
+  * [5585feb] simplify udev dependency
+  * [4cc8116] add a versioned dependency on dmsetup (Closes: #497686)
+  * [9887760] blacklist cciss devices (Closes: #500991)
+
+ -- Guido Günther <[e-mail]>  Fri, 03 Oct 2008 12:42:46 +0200
+
+multipath-tools (0.4.8-12) unstable; urgency=low
+
+  * [2ee3c11] udev as of 0.124 doesn't support 'scsi_id -s' anymore
+  * [736eaa3] ...unfortunately older udev's don't support 'scsi_id -d'
+    properly so add a conflict
+  * [49961fa] update bugnumbers for the "dmsetup export" fun
+  * [82d47a3] bump standards version
+  * [18fb979] add README.source
+
+ -- Guido Guenther <[e-mail]>  Thu, 21 Aug 2008 09:28:30 +0200
+
+multipath-tools (0.4.8-11) unstable; urgency=low
+
+  * [3dadace] use the full path to dmsetup so we don't have to worry about
+    $PATH
+  * [33642da] update initramfs during postinst/postrm (Closes: #477839)
+  * [41391c9] Conflict on etch's multipath-tools-initramfs - together with the
+    multipath-tools-initramfs NMU from Bernd Zeimetz this provides a clean
+    upgrade path from etch to lenny for multipath-tools-initramfs users.
+  * [4f8a5d1] Call multipath via udev on block device add/change events This
+    helps slow devices when either /etc/init.d/multipath-tools-boot or the
+    initramfs script are being run although the devices are not ready yet.
+    (Closes: #489850) - many thanks to Janusz Dziemidowicz for his suggestions
+    and testing 
+  * [5cbb079] add swedish debconf translation (Closes: #492107) - thanks to
+    Martin Ã…gren
+  * [12639e9] redo quilt patches - no code changes
+
+ -- Guido Guenther <[e-mail]>  Wed, 30 Jul 2008 17:59:03 -0400
+
+multipath-tools (0.4.8-10) unstable; urgency=low
+
+  * [183da2c] Add russion debconf translation (Closes: #486353) - thanks
+    to Yuri Kozlov
+  * [02b7853] Add pt, de, and fr translations (Closes: #482035, #482845,
+    #482905) - thanks to the Portuguese Translation Team, Helge
+    Kreutzmann and Jean Guillou
+
+ -- Guido Guenther <[e-mail]>  Thu, 19 Jun 2008 13:06:09 +0200
+
+multipath-tools (0.4.8-9) unstable; urgency=low
+
+  * [958c4b1] attach multipath.conf to bugreports
+  * [2ac083e] make multipath-tools-boot arch all
+  * [2eb8b51] Warn about outdated /etc/multipath.conf via debconf. The
+    changed location of udev's /sbin/scsi_id already hit two people.
+    Since this renders the system unbootable we should warn about it at
+    priority critical. (Closes: #481447)
+
+ -- Guido Guenther <[e-mail]>  Sat, 17 May 2008 15:13:40 +0200
+
+multipath-tools (0.4.8-8) unstable; urgency=low
+
+  * libdevmapper doesn't ship the init script anymore so drop that and depend
+    on checkroot instead so we have a defined boot order (Closes: 470063)
+  * multipath-tools.init: remove superflous stop link in S in the LSB header
+  * add boot breakage warning to multipath-tools boot
+  * depend on libdevmapper-dev (>= 2:1.02.20) instead of (>= 2:1.02.20-1)
+    since this eases backports
+  * bump standards version
+
+ -- Guido Guenther <[e-mail]>  Sun, 09 Mar 2008 18:55:38 +0100
+
+multipath-tools (0.4.8-7) unstable; urgency=low
+
+  * add watch file
+  * move multipath-tools-boot startup to S21 to allow module-loading
+    (Closes: #457804)
+
+ -- Guido Guenther <[e-mail]>  Tue, 08 Jan 2008 13:49:18 +0100
+
+multipath-tools (0.4.8-6) unstable; urgency=low
+
+  * depend on a libaio that resides in /lib (>= 0.3.106-8) so we can...
+  * ...drop link-libaio-static.diff
+  * fix_wwid_blacklist.diff: pulled from upstream to fix blacklisting by
+    wwid
+  * kpartx-docfix.diff: document -g
+  * kpartx-remove-dead-code.diff: remove unused commandline option
+  * kpartx-fix-extpart-rm.diff: fix partition removal of extended
+    partitions
+
+ -- Guido Guenther <[e-mail]>  Sat, 01 Dec 2007 15:41:36 +0100
+
+multipath-tools (0.4.8-5) unstable; urgency=low
+
+  * apply kpartx-fix-udev-dmraid.diff to our shipped udev rules too
+  * fix itemized list in control file (Closes: #441176)
+  * link statically against libaio since it's in /usr/lib and
+    multipath{,d} are in /sbin and we can avoid a libaio udeb for now
+  * build a udeb for d-i support (Closes: #440334)
+
+ -- Guido Guenther <[e-mail]>  Fri, 07 Sep 2007 19:47:05 +0200
+
+multipath-tools (0.4.8-4) unstable; urgency=low
+
+  * split out initramfs support into a separate package (Closes: #440206)
+  * copy persistent bindings into initramfs
+  * debian/rules: don't ignore errors on clean (to make lintian happy)
+  * multipath-tools-boot.sh: add Default-Stop pseudo header
+
+ -- Guido Guenther <[e-mail]>  Fri, 31 Aug 2007 09:47:35 +0200
+
+multipath-tools (0.4.8-3) unstable; urgency=low
+
+  * add a prerm script to handle updates from broken versions that don't allow
+    for a stopped multipathd in the init script, really (closes: #439126).
+
+ -- Guido Guenther <[e-mail]>  Sun, 26 Aug 2007 10:24:49 +0200
+
+multipath-tools (0.4.8-2) unstable; urgency=low
+
+  * initramfs: mpath_prio_tpc has been renamed to mpath_prio_rdac
+  * fetch patches by Hannes Reinecke from dm-devel:
+  	* fix udev rule for dmraid: kpartx-fix-udev-dmraid.diff
+        * fix extended partition calculation in kpartx: kpartx-fix-extpart.diff
+  * fix DEB_BUILD_OTIIONS=nostrip (Closes: #437596)
+
+ -- Guido Guenther <[e-mail]>  Mon, 13 Aug 2007 18:32:12 +0200
+
+multipath-tools (0.4.8-1) unstable; urgency=low
+
+  * new upstream release
+  * drop clariion-fix-read-buffer.diff, applied upstream
+  * init script: don't fail the stop target if multipathd
+  * conflict with multipath-tools-initramfs
+
+ -- Guido Guenther <[e-mail]>  Sat, 04 Aug 2007 13:08:52 +0200
+
+multipath-tools (0.4.7-9) unstable; urgency=low
+
+  * fix segfault on EMC Clariions
+  * add initramfs hooks to support rootfs on multipath
+  * version the dependency on dmsetup since the one from etch doesn't
+    support -oattr needed by dmsetup_env
+  * use LSB functions in init scripts
+
+ -- Guido Guenther <[e-mail]>  Tue, 31 Jul 2007 14:01:00 +0200
+
+multipath-tools (0.4.7-8) unstable; urgency=low
+
+  * since Debian's dmestup doesn't include the "export" patch used by other
+    distros (#434241), work around this by implementing a minimal dmsetup_env
+    that can be used by kpartx.udev (Closes: #376161)
+  * add LSB headers to init scripts
+
+ -- Guido Guenther <[e-mail]>  Sat, 28 Jul 2007 17:34:48 +0200
+
+multipath-tools (0.4.7-7) unstable; urgency=low
+
+  * create build dirs (Closes: #425910)
+  * forward to upstream git b413c9dbe554c2d50aba7c6446ec86f850cf8dde
+  * drop libmultipath-cache-sysfs_devices.diff, applied upstream
+
+ -- Guido Guenther <[e-mail]>  Fri, 27 Jul 2007 22:25:29 +0200
+
+multipath-tools (0.4.7-6) unstable; urgency=low
+
+  * kpartx.udev: fix path to kpartx_id
+  * install kpartx_id
+  * debian/control: add XS-Vcs-Browser
+
+ -- Guido Guenther <[e-mail]>  Sun, 22 Jul 2007 15:38:05 +0200
+
+multipath-tools (0.4.7-5) unstable; urgency=low
+
+  * forward to upstream git 00fe3ac6ff515bec4a2c7385d6e2e4a7ed5dfb36 
+  * new patch: libmultipath-cache-sysfs_devices.diff (Closes: #433949)
+
+ -- Guido Guenther <[e-mail]>  Fri, 20 Jul 2007 23:15:27 +0200
+
+multipath-tools (0.4.7-4) unstable; urgency=low
+
+  * move to git
+  * Drop patches applied upstream:
+  	  * fix-segfault-on-disappearing-paths.diff
+          * exclude-quilt.diff
+          * scsi_id.diff
+          * Makefile_cleanups.diff
+  * use dh_installudev
+  * no need to build-depend on libsysfs-dev anymore
+  * build-depend on libaio-dev
+
+ -- Guido Guenther <[e-mail]>  Fri, 29 Jun 2007 11:31:28 -0400
+
+multipath-tools (0.4.7-3) experimental; urgency=low
+
+  * forward to upstream git as of 178b93111d54828a89ad280c0aaaea0812343a6a
+    (Closes: #427532, #365363)
+  * adjust scsi_id.patch to apply again
+  * drop udev.patch, not needed
+  * make sure multipath-tools-init runs after udev so the /dev/mapper/
+    entries appear in the correct place
+  * debhelper version 5 (Closes: #425910)
+  * split out kpartx into a separate package (Closes: #422600)
+
+ -- Guido Guenther <[e-mail]>  Fri, 08 Jun 2007 11:51:00 +0200
+
+multipath-tools (0.4.7-2) unstable; urgency=low
+
+  [ Bastian Blank ]
+  * Use /lib/udev/scsi_id. (closes: #358985)
+
+  [ Guido Guenther ]
+  * Acknowledge NMU - thanks John! (closes: #382244)
+  * use quilt for the git patch
+  * remove Bastian and Andres from Uploaders on their request
+  * cleanup pp_hds_modular so the package is rebuildable several times
+  * scsi_id.diff, Makefile-cleanups.diff, remove-arch-ifdefs.diff, udev.diff:
+    split out Debian's modifications into separate patches
+  * remove now superflous multipath.sh (closes: #350814)
+  * bump standards version to 3.7.2 (no source changes) 
+
+ -- Guido Guenther <[e-mail]>  Wed, 20 Dec 2006 17:40:59 +0100
+
+multipath-tools (0.4.7-1.1) unstable; urgency=medium
+
+  * Added missing dependency on dmsetup.  Closes: #381068.
+  * Fixed PID file handling.  Closes: #294066.
+  * Pulled in numerous fixes from upstream git tree to fix
+    various segfaults, spewing garbage onto the console, etc.
+    Tree is now synced to upstream git as of commit
+    40b575955cc189aa993e6a030b66b5fef6bcf288 on July 19, 2006, 
+    which is the current state of the upstream tree.  Closes: #382214.
+
+ -- John Goerzen <[e-mail]>  Wed,  9 Aug 2006 11:52:08 -0500
+
+multipath-tools (0.4.7-1) unstable; urgency=low
+
+  * New upstream version. 
+    - Build against libsysfs2. (closes: #355775)
+  * Acknowledge NMU. (closes: #337081)
+
+ -- Bastian Blank <[e-mail]>  Fri, 17 Mar 2006 17:23:03 +0100
+
+multipath-tools (0.4.6-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <[e-mail]>  Thu, 09 Feb 2006 22:12:52 +0100
+
+multipath-tools (0.4.5-3) unstable; urgency=low
+
+  * Fix kpartx compiling errors and dos support.
+
+ -- Bastian Blank <[e-mail]>  Fri, 30 Sep 2005 13:01:55 +0200
+
+multipath-tools (0.4.5-2) unstable; urgency=low
+
+  * Move boot init script before udev and load dm-multipath module.
+
+ -- Bastian Blank <[e-mail]>  Wed, 28 Sep 2005 19:35:49 +0200
+
+multipath-tools (0.4.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Move device check logic to udev rules.
+  * Don't longer create devices in /dev by default.
+
+ -- Bastian Blank <[e-mail]>  Mon, 19 Sep 2005 16:32:00 +0200
+
+multipath-tools (0.4.2.4-2) unstable; urgency=medium
+
+  * New maintainer.
+  * Rebuild against new libdevmapper.
+
+ -- Bastian Blank <[e-mail]>  Fri, 04 Mar 2005 15:16:30 +0100
+
+multipath-tools (0.4.2.4-1) unstable; urgency=low
+
+  * New upstream.
+    NOTE: This is actually upstream's 0.4.2 but 0.4.2.3 came first for some
+    reason.
+  * Use start-stop-daemon to control the multipathd daemon and do it's own
+    PID file handling (which is now commented out of the daemon itself)
+
+ -- Patrick Caulfield <[e-mail]>  Fri, 28 Jan 2005 15:15:01 +0000
+
+multipath-tools (0.4.2.3-1) unstable; urgency=low
+
+  * New upstream
+  * Remove initrd files as they break things.
+    Closes: #288150
+  * Fix some duplicate patching.
+
+ -- Patrick Caulfield <[e-mail]>  Mon, 17 Jan 2005 11:19:20 +0000
+
+multipath-tools (0.4.1-1) unstable; urgency=low
+
+  * New upstream
+    Closes: #295926, #286789
+  * Include initrd scripts contributed by Guido Guenther
+    Closes: #286791
+
+ -- Patrick Caulfield <[e-mail]>  Thu, 13 Jan 2005 09:25:42 +0000
+
+multipath-tools (0.4.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Patrick Caulfield <[e-mail]>  Fri, 24 Dec 2004 11:54:44 +0000
+
+multipath-tools (0.3.9-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Patrick Caulfield <[e-mail]>  Tue,  7 Dec 2004 13:15:15 +0000
+
+multipath-tools (0.3.8-1) unstable; urgency=low
+
+  * New upstream
+  * Fix error in preinst, when upgrading.
+  * Don't clean klibc directory. 
+    Closes: #283043
+
+ -- Patrick Caulfield <[e-mail]>  Mon, 29 Nov 2004 08:56:50 +0000
+
+multipath-tools (0.3.7-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Patrick Caulfield <[e-mail]>  Sat, 13 Nov 2004 11:14:35 +0000
+
+multipath-tools (0.3.6-1) unstable; urgency=low
+
+  * Initial upload. Based loosely on upstream's work
+    Closes: #277898
+
+ -- Patrick Caulfield <[e-mail]>  Wed,  3 Nov 2004 10:16:34 +0000
+
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2011-01-04 21:28:57 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2011-01-04 21:28:57 +0000
@@ -0,0 +1,60 @@
+Source: multipath-tools
+Section: admin
+Priority: extra
+Maintainer: Ubuntu Core Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian LVM Team <[e-mail]>
+Uploaders: Guido Günther <[e-mail]>
+Build-Depends: debhelper (>= 7.0.17ubuntu2), po-debconf, libdevmapper-dev (>= 2:1.02.20), libreadline-dev, quilt (>= 0.40), libaio-dev
+XS-Vcs-Git: git://git.debian.org/git/pkg-lvm/multipath-tools.git
+XS-Vcs-Browser: http://git.debian.org/?p=pkg-lvm/multipath-tools.git
+Standards-Version: 3.9.1
+Homepage: http://christophe.varoqui.free.fr/
+
+Package: multipath-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev (>= 136-1), initscripts (>= 2.85-16),
+ kpartx (>= ${binary:Version}), lsb-base (>= 3), libaio1 (>= 0.3.106-8), sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Conflicts: multipath-tools-initramfs (<= 1.0.1)
+Suggests: multipath-tools-boot
+Description: maintain multipath block device access
+ These tools are in charge of maintaining the disk multipath device maps and
+ react to path and map events.
+ .
+ If you install this package you may have to change the way you address block
+ devices. See README.Debian for details.
+
+Package: kpartx
+Architecture: any
+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: multipath-tools-boot
+Architecture: all
+Depends: ${misc:Depends}, initramfs-tools, 
+ multipath-tools (>= ${source:Version}), multipath-tools (<< ${source:Version}.1~)
+Replaces: multipath-tools-initramfs (<< 1.0.1+nmu1)
+Conflicts: multipath-tools-initramfs (<< 1.0.1+nmu1)
+Description: Support booting from multipath devices
+ This package contains the necessary support for booting from a multipath
+ device:
+ .
+  * copy over multipath.conf and persistent bindings if necessary
+  * load the necessary kernel modules
+  * detect multipath block devices
+ .
+ Don't install this package if you're not booting from a multipath device.
+
+Package: multipath-udeb
+XC-Package-Type: udeb
+Architecture: any
+Depends: ${shlibs:Depends}
+Section: debian-installer
+Description: maintain multipath block device access
+ This is a udeb, or a microdeb, for the debian-installer.
+ .
+ These tools are in charge of maintaining the disk multipath device maps and
+ react to path and map events.
+

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2011-01-04 21:28:57 +0000
@@ -0,0 +1,12 @@
+This is the Debian GNU/Linux prepackaged version of multipath-tools.
+
+Copyright (C) 2003,2004 Christophe Varoqui <[e-mail]>
+
+multipath-tools is licensed under the GNU GPL version 2.
+libsysfs is licensed under the GNU LGPL version 2.1 or later.
+libdevmapper is licensed under the GNU LGPL version 2.
+
+On Debian systems, the complete text of the GNU General Public License
+and of the GNU Lesser Public License can be found in
+/usr/share/common-licenses/GPL and /usr/share/common-licenses/LGPL .
+

=== added file 'debian/dmsetup_env'
--- debian/dmsetup_env	1970-01-01 00:00:00 +0000
+++ debian/dmsetup_env	2011-01-04 21:28:57 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Debian's dmsetup is lacking the export patch, so gather the minimum
+# information here in order to get proper partition mappings via kpartx
+# 
+# See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=434241
+#      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=487881
+#      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493078
+
+MAJOR=$1
+MINOR=$2
+
+if [ -z "$MAJOR" -o -z "$MINOR" ]; then
+    echo "usage: $0 major minor"
+    exit 1
+fi
+
+DMSETUP="/sbin/dmsetup -c --noheadings info -j$MAJOR  -m$MINOR"
+
+DM_UUID=`$DMSETUP -oUUID`
+if [ -n "$DM_UUID" ]; then 
+    echo DM_UUID=$DM_UUID
+    ATTRS=`$DMSETUP -oattr`
+    case "$ATTRS" in
+        L-*) # this is the only state needed for the kpartx udev rules
+            echo DM_TABLE_STATE=LIVE
+	    echo DM_STATE=ACTIVE
+	    ;;
+    esac
+fi
+echo DM_NAME=`$DMSETUP -oname`

=== added directory 'debian/initramfs'
=== added file 'debian/initramfs/hooks'
--- debian/initramfs/hooks	1970-01-01 00:00:00 +0000
+++ debian/initramfs/hooks	2011-01-04 21:28:57 +0000
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+PREREQS="udev"
+
+prereqs() { echo "$PREREQS"; }
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+if [ ! -x /sbin/multipath ]; then
+	exit 0
+fi
+
+. /usr/share/initramfs-tools/hook-functions
+
+add_bindings()
+{
+  if [ -r /var/lib/multipath/bindings ]; then
+      mkdir -p $DESTDIR/var/lib/multipath
+      cp /var/lib/multipath/bindings $DESTDIR/var/lib/multipath/
+  fi
+}
+
+add_udev_rules()
+{
+  for rules in 95-multipath.rules 95-kpartx.rules; do
+    if [ -e /lib/udev/rules.d/$rules ]; then
+      cp -p /lib/udev/rules.d/$rules $DESTDIR/lib/udev/rules.d/
+    fi
+  done
+}
+
+copy_exec /sbin/multipath 		/sbin
+copy_exec /sbin/kpartx    		/sbin
+copy_exec /sbin/devmap_name		/sbin
+copy_exec /sbin/dmsetup			/sbin
+copy_exec /lib/udev/dmsetup_env		/lib/udev
+copy_exec /lib/udev/kpartx_id		/lib/udev
+
+copy_exec /sbin/mpath_prio_alua         /sbin
+copy_exec /sbin/mpath_prio_emc          /sbin
+copy_exec /sbin/mpath_prio_hp_sw        /sbin
+copy_exec /sbin/mpath_prio_rdac         /sbin
+copy_exec /sbin/mpath_prio_netapp       /sbin
+copy_exec /sbin/mpath_prio_random       /sbin
+copy_exec /sbin/mpath_prio_hds_modular  /sbin
+copy_exec /sbin/mpath_prio_balance_units /sbin
+
+mkdir -p $DESTDIR/lib/multipath/
+for x in /lib/multipath/*; do
+    copy_exec $x /lib/multipath/
+done
+add_udev_rules
+
+[ -r /etc/multipath.conf ] && cp /etc/multipath.conf $DESTDIR/etc/
+add_bindings
+
+for x in dm-multipath dm-round-robin dm-emc; do
+	manual_add_modules ${x}
+done
+

=== added file 'debian/initramfs/local-top'
--- debian/initramfs/local-top	1970-01-01 00:00:00 +0000
+++ debian/initramfs/local-top	2011-01-04 21:28:57 +0000
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+# multipath discovery
+
+PREREQ="udev iscsi"
+
+prereqs() { echo "$PREREQ"; }
+
+case $1 in
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+. /scripts/functions
+
+verbose()
+{
+  case "$quiet" in y*|Y*|1|t*|T*)
+    return 1;;
+  *)
+    return 0;;
+  esac
+}
+
+maybe_break pre-multipath
+VERBOSITY=0
+MP_MODULES="dm-multipath dm-emc"
+
+if [ ! -e /sbin/multipath ]; then
+	exit 0
+fi
+
+verbose && log_begin_msg "Loading multipath modules"
+for module in ${MP_MODULES}; do
+  if modprobe --syslog "$module"; then
+    verbose && log_success_msg "loaded module ${module}."
+  else
+    log_failure_msg "failed to load module ${module}."
+  fi
+done
+verbose && log_end_msg
+
+verbose && log_begin_msg "Discovering multipaths"
+/sbin/multipath -v $VERBOSITY
+verbose && log_end_msg
+
+if [ -x /sbin/kpartx -a -x /sbin/dmsetup ]; then
+	/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null
+fi
+
+if [ -x /sbin/udevadm ]; then
+    /sbin/udevadm settle --timeout=10
+fi
+
+maybe_break post-multipath
+
+exit 0
+

=== added file 'debian/kpartx.install'
--- debian/kpartx.install	1970-01-01 00:00:00 +0000
+++ debian/kpartx.install	2011-01-04 21:28:57 +0000
@@ -0,0 +1,4 @@
+/usr/share/man/man8/kpartx.8.gz
+/sbin/kpartx
+/lib/udev/kpartx_id
+/lib/udev/dmsetup_env

=== added file 'debian/kpartx.manpages'
--- debian/kpartx.manpages	1970-01-01 00:00:00 +0000
+++ debian/kpartx.manpages	2011-01-04 21:28:57 +0000
@@ -0,0 +1,1 @@
+kpartx/kpartx.8

=== added file 'debian/kpartx.postinst'
--- debian/kpartx.postinst	1970-01-01 00:00:00 +0000
+++ debian/kpartx.postinst	2011-01-04 21:28:57 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for kpartx
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+RULE=/etc/udev/rules.d/kpartx.rules
+
+case "$1" in
+    configure)
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.4.7-4"; then
+	    if [ -L $RULE ] && ! readlink -e $RULE; then
+	    	echo -n "Removing dangling $RULE symlink..."
+		rm $RULE
+		echo "done."
+	    fi
+	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.udev'
--- debian/kpartx.udev	1970-01-01 00:00:00 +0000
+++ debian/kpartx.udev	2011-01-04 21:28:57 +0000
@@ -0,0 +1,45 @@
+#
+# persistent links for device-mapper devices
+# only hardware-backed device-mapper devices (ie multipath, dmraid,
+# 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"
+
+ENV{DM_TABLE_STATE}!="LIVE", GOTO="kpartx_end"
+
+ENV{DM_UUID}=="?*", IMPORT{program}=="kpartx_id %M %m $env{DM_UUID}"
+
+OPTIONS="link_priority=50"
+
+# Create persistent links for multipath tables
+ENV{DM_UUID}=="mpath-*", \
+	SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
+
+# Create persistent links for dmraid tables
+ENV{DM_UUID}=="dmraid-*", \
+        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
+
+# Create persistent links for partitions
+ENV{DM_PART}=="?*", \
+        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}-part$env{DM_PART}"
+
+# Create dm tables for partitions
+ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \
+        RUN+="/sbin/kpartx -a -p -part /dev/$name"
+ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \
+        RUN+="/sbin/kpartx -a -p -part /dev/$name"
+
+LABEL="kpartx_end"
+
+

=== added file 'debian/multipath-tools-boot.config'
--- debian/multipath-tools-boot.config	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools-boot.config	2011-01-04 21:28:57 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+CONF=/etc/multipath.conf
+
+# if the user still references /sbin/scsi_id warn him:
+if [ -e "$CONF" ] && grep -sq '^[[:space:]]*getuid_callout[[:space:]]*\"/sbin/scsi_id[[:space:]]\+' $CONF; then
+    . /usr/share/debconf/confmodule
+    db_input critical multipath-tools-boot/scsi_id || true
+    db_go || true
+fi
+

=== added file 'debian/multipath-tools-boot.postinst'
--- debian/multipath-tools-boot.postinst	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools-boot.postinst	2011-01-04 21:28:57 +0000
@@ -0,0 +1,34 @@
+#!/bin/sh
+# postinst script for multipath-tools
+#
+# 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/multipath-tools-boot.postrm'
--- debian/multipath-tools-boot.postrm	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools-boot.postrm	2011-01-04 21:28:57 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+# postrm script for multipath-tools-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
+
+

=== added file 'debian/multipath-tools-boot.templates'
--- debian/multipath-tools-boot.templates	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools-boot.templates	2011-01-04 21:28:57 +0000
@@ -0,0 +1,10 @@
+Template: multipath-tools-boot/scsi_id
+Type: note
+_Description: The location of the getuid callout has changed
+ Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/scsi_id
+ but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. Please update
+ your configuration. This is best done by removing the getuid_callout option
+ entirely.
+ .
+ Don't forget to update your initramfs after these changes. Otherwise your
+ system might not boot from multipath.

=== added file 'debian/multipath-tools.README.Debian'
--- debian/multipath-tools.README.Debian	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.README.Debian	2011-01-04 21:28:57 +0000
@@ -0,0 +1,71 @@
+Additional information for users of multipath-tools from Debian.
+
+What are these weird numbers in /dev/mapper?
+============================================
+Modern Fibre-Channel connected storage devices are identified by
+World-Wide-Numbers. If multipath-tools detects one of these devices,
+it uses that as the default identifier in /dev/mapper.
+If you want multipath-tools to use easier-to-read names, set
+  user_friendly_names = yes
+in the 'defaults' section of /etc/multipath.conf.
+
+Note: While widely used (including the Debian Installer, which depends on it),
+user_friendly_names can lead to locking issues with large numbers of LUNs
+resulting in some maps not having friendly_names [1].
+
+Where did my FC-connected filesystem go?
+========================================
+If you were previously mounting a device connected to your system by
+Fibre Channel and then installed multipath-tools, you need to change
+the way you mount the device. The device must now be accessed using
+the identifier by which device-mapper knows it.
+
+For example if you have in /dev/mapper a file like this:
+   brw-rw---- 1 root disk 254,  8 2009-01-05 14:35 /dev/mapper/36000393000007d3901000000fef00a2d
+
+then you can mount the filesystem like this:
+  mount /dev/mapper/36000393000007d3901000000fef00a2d /mnt
+or this
+  mount /dev/disk/by-id/scsi-36000393000007d3901000000fef00a2d /mnt
+You should prefer the latter, as this will work whether or not
+multipath-tools is installed.
+
+Note that with multipath-tools installed you cannot use the device's node
+in /dev, e.g.
+  # mount /dev/sdc1 /mnt
+  mount: /dev/sdc1 already mounted or /mnt busy
+The device is 'busy' because it is part of a multipath map.
+See the output of 'multipath -l' to confirm this.
+
+Preventing multipath-tools mapping any devices
+==============================================
+You may wish to prevent multipath-tools mapping any of your storage devices.
+To do this replace the contents of /etc/multipath.conf with:
+
+  blacklist {
+         devnode "*"
+  }
+
+Booting from multipathed devices
+================================
+To enable booting from multipathed devices install the multipath-tools-boot
+package. Be sure to update your bootloader configuration (e.g.
+/boot/grub/menu.lst) to point to the multipathed root device afterwards.
+
+By default this will be
+
+  /dev/disk/by-id/scsi-<wwid>-part<N>
+
+If you set user_friendly_names = yes in /etc/multipath.conf, the path
+to the device will be
+
+  /dev/mapper/mpath<X>-part<N>
+
+If you make changes in multipath.conf, remember to run update-initramfs so the
+updated version of the configuration gets included in the initramfs.
+
+ -- Guido Günther <[e-mail]>  Tue, 20 Feb 2008 13:49:18 +0100
+
+-- 
+[1] https://bugzilla.redhat.com/show_bug.cgi?id=445268
+

=== added file 'debian/multipath-tools.docs'
--- debian/multipath-tools.docs	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.docs	2011-01-04 21:28:57 +0000
@@ -0,0 +1,2 @@
+FAQ
+README

=== added file 'debian/multipath-tools.examples'
--- debian/multipath-tools.examples	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.examples	2011-01-04 21:28:57 +0000
@@ -0,0 +1,2 @@
+multipath.conf.annotated
+multipath.conf.synthetic

=== added file 'debian/multipath-tools.init'
--- debian/multipath-tools.init	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.init	2011-01-04 21:28:57 +0000
@@ -0,0 +1,57 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          multipath-tools
+# Required-Start:    udev $local_fs $syslog
+# Required-Stop:     udev $local_fs $syslog
+# Should-Start:      iscsi
+# Should-Stop:       iscsi
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: multipath daemon
+# Description:
+### END INIT INFO
+
+PATH=/sbin:/bin
+DAEMON=/sbin/multipathd
+NAME=multipathd
+DESC="multipath daemon"
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+if [ -f /etc/default/multipath-tools ] ; then
+	. /etc/default/multipath-tools
+fi
+
+set -e
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC" "$NAME"
+	start-stop-daemon --oknodo --start --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	log_end_msg $?
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+	log_end_msg $?
+	;;
+  reload|force-reload)
+	log_daemon_msg "Reloading $DESC" "$NAME"
+	start-stop-daemon --stop --signal 1 --quiet --pidfile /var/run/$NAME.pid --exec $DAEMON
+	log_end_msg $?
+	;;
+  restart|force-reload)
+  	$0 stop
+	sleep 1
+	$0 start
+	;;
+  *)
+	N=/etc/init.d/multipath-tools
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

=== added file 'debian/multipath-tools.install'
--- debian/multipath-tools.install	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.install	2011-01-04 21:28:57 +0000
@@ -0,0 +1,4 @@
+/sbin/multi*
+/lib/multipath/*
+/lib/libmultipath.so.*
+/usr/share/man/man*/multi*gz

=== added file 'debian/multipath-tools.postinst'
--- debian/multipath-tools.postinst	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.postinst	2011-01-04 21:28:57 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postinst script for multipath-tools
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+RULE=/etc/udev/rules.d/multipath.rules
+
+case "$1" in
+    configure)
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "0.4.7-4"; then
+	    if [ -L $RULE ] && ! readlink -e $RULE; then
+	    	echo -n "Removing dangling $RULE symlink..."
+		rm $RULE
+		echo "done."
+	    fi
+	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/multipath-tools.preinst'
--- debian/multipath-tools.preinst	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.preinst	2011-01-04 21:28:57 +0000
@@ -0,0 +1,43 @@
+#! /bin/sh
+# preinst script for multipath-tools
+
+set -e
+
+case "$1" in
+    install)
+    ;;
+
+    upgrade)
+	if dpkg --compare-versions "$2" lt "0.4.7-3"; then
+	    [ -e /etc/rcS.d/S03multipath-tools-boot ] && rm /etc/rcS.d/S03multipath-tools-boot
+	fi
+	if dpkg --compare-versions "$2" lt "0.4.8-7"; then
+	    [ -e /etc/rcS.d/S04multipath-tools-boot ] && rm /etc/rcS.d/S04multipath-tools-boot
+	fi
+	if dpkg --compare-versions "$2" lt "0.4.9"; then
+	    if [ -e /var/lib/multipath/bindings ]; then
+	        echo "Moving bindings file to /etc/multipath/"
+	        mkdir -p /etc/multipath/
+	        mv /var/lib/multipath/bindings /etc/multipath/
+	    fi
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+if ! dmsetup targets | cut -d' ' -f1 | grep -q '^multipath$'; then
+ modprobe -v dm-multipath || true
+fi
+
+#DEBHELPER#
+
+exit 0
+
+

=== added file 'debian/multipath-tools.prerm'
--- debian/multipath-tools.prerm	1970-01-01 00:00:00 +0000
+++ debian/multipath-tools.prerm	2011-01-04 21:28:57 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# multipath-tools prerm script
+set -e
+
+FIXED=0.4.8-1
+# fix upgrades from versions << $FIXED where the init script would return an
+# error on stop when the daemon isn't running:
+if [ "$1" = "failed-upgrade" ] && dpkg --compare-versions "$2" lt "$FIXED"; then
+    if [ -x "/etc/init.d/multipath-tools" ]; then
+	echo "Ignoring broken stop target in versions << $FIXED..."
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d multipath-tools stop || true
+	else
+		/etc/init.d/multipath-tools stop || true
+	fi
+	exit 0
+    fi
+fi
+
+#DEBHELPER#
+

=== added file 'debian/multipath-udeb.install'
--- debian/multipath-udeb.install	1970-01-01 00:00:00 +0000
+++ debian/multipath-udeb.install	2011-01-04 21:28:57 +0000
@@ -0,0 +1,4 @@
+/sbin/multipath
+/lib/multipath/
+/lib/libmultipath.so.*
+/sbin/kpartx

=== added file 'debian/multipath.udev'
--- debian/multipath.udev	1970-01-01 00:00:00 +0000
+++ debian/multipath.udev	2011-01-04 21:28:57 +0000
@@ -0,0 +1,12 @@
+#
+# udev rules for multipathing.
+# The persistent symlinks are created with the kpartx rules
+#
+
+# socket for uevents
+RUN+="socket:/org/kernel/dm/multipath_event"
+
+# Coalesce multipath devices before multipathd is running (initramfs, early
+# boot)
+ACTION=="add|change", SUBSYSTEM=="block", RUN+="/sbin/multipath -v0 /dev/$name"
+

=== added directory 'debian/patches'
=== added file 'debian/patches/0001-blacklist-cciss-devices.patch'
--- debian/patches/0001-blacklist-cciss-devices.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-blacklist-cciss-devices.patch	2011-01-04 21:28:57 +0000
@@ -0,0 +1,29 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <[e-mail]>
+Date: Fri, 3 Oct 2008 12:39:48 +0200
+Subject: [PATCH] blacklist cciss devices
+
+cciss support isn't complete in 0.4.8 and the half functioning causes
+problems in d-i among other things.
+Closes: #500991
+---
+ libmultipath/blacklist.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
+index f369517..2e5efc8 100644
+--- a/libmultipath/blacklist.c
++++ b/libmultipath/blacklist.c
+@@ -121,6 +121,12 @@ setup_default_blist (struct config * conf)
+ 	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
+ 		return 1;
+ 
++	str = STRDUP("^cciss!c[0-9]d[0-9]*");
++	if (!str)
++		return 1;
++	if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT))
++		return 1;
++
+ 	vector_foreach_slot (conf->hwtable, hwe, i) {
+ 		if (hwe->bl_product) {
+ 			if (alloc_ble_device(conf->blist_device))
+-- 

=== added file 'debian/patches/0002-Make-user_friendly_names-compatible-to-multipath-too.patch'
--- debian/patches/0002-Make-user_friendly_names-compatible-to-multipath-too.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0002-Make-user_friendly_names-compatible-to-multipath-too.patch	2011-01-04 21:28:57 +0000
@@ -0,0 +1,60 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <[e-mail]>
+Date: Sat, 21 Nov 2009 17:31:55 +0100
+Subject: [PATCH] Make user_friendly_names compatible to multipath-tools 0.4.8 and earlier
+
+---
+ libmultipath/alias.c |   30 ++++++------------------------
+ 1 files changed, 6 insertions(+), 24 deletions(-)
+
+diff --git a/libmultipath/alias.c b/libmultipath/alias.c
+index 95506b4..02b384b 100644
+--- a/libmultipath/alias.c
++++ b/libmultipath/alias.c
+@@ -184,40 +184,22 @@ format_devname(char *name, int id, int len)
+ {
+ 	int pos;
+ 
+-	memset(name,0, len);
+-	strcpy(name,"mpath");
+-	for (pos = len - 1; pos >= 5; pos--) {
+-		name[pos] = 'a' + id % 26;
+-		if (id < 26)
+-			break;
+-		id /= 26;
+-		id--;
+-	}
+-	memmove(name + 5, name + pos, len - pos);
+-	name[5 + len - pos] = '\0';
+-	return (5 + len - pos);
++	memset(name, 0, len);
++	return snprintf(name, len, "mpath%d", id);
+ }
+ 
+ static int
+ scan_devname(char *alias)
+ {
+-	char *c;
+-	int i, n = 0;
++	int n = 0;
+ 
+ 	if (strncmp(alias, "mpath", 5))
+ 		return -1;
+ 
+-	c = alias + 5;
+-	while (*c != '\0' && *c != ' ' && *c != '\t') {
+-		i = *c - 'a';
+-		n = ( n * 26 ) + i;
+-		c++;
+-		if (*c < 'a' || *c > 'z')
+-			break;
+-		n++;
+-	}
++	if (sscanf(alias, "mpath%d", &n) >= 1)
++		return n;
+ 
+-	return n;
++	return -1;
+ }
+ 
+ static int
+-- 

=== added file 'debian/patches/0003-explicitly-include-posix_types.h.patch'
--- debian/patches/0003-explicitly-include-posix_types.h.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-explicitly-include-posix_types.h.patch	2011-01-04 21:28:57 +0000
@@ -0,0 +1,36 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <[e-mail]>
+Date: Sat, 5 Dec 2009 18:11:00 +0100
+Subject: [PATCH] explicitly include posix_types.h
+
+to get the correct type for __kernel_old_dev_t
+
+Closes: #558990
+---
+ kpartx/lopart.c |   13 +------------
+ 1 files changed, 1 insertions(+), 12 deletions(-)
+
+diff --git a/kpartx/lopart.c b/kpartx/lopart.c
+index 79d8328..570c8ad 100644
+--- a/kpartx/lopart.c
++++ b/kpartx/lopart.c
+@@ -26,18 +26,7 @@
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+ #include <sysmacros.h>
+-
+-#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \
+- || defined (__x86_64__)
+-typedef unsigned long __kernel_old_dev_t;
+-#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__))
+-typedef unsigned int __kernel_old_dev_t;
+-#else
+-typedef unsigned short __kernel_old_dev_t;
+-#endif
+-
+-#define dev_t __kernel_old_dev_t
+-
++#include <asm/posix_types.h>
+ #include <linux/loop.h>
+ 
+ #include "lopart.h"
+-- 

=== added file 'debian/patches/1000--set-umask-in-multipathd.patch'
--- debian/patches/1000--set-umask-in-multipathd.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1000--set-umask-in-multipathd.patch	2011-01-04 21:28:57 +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 <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/poll.h>
++#include <sys/stat.h>
+ 
+ #include <checkers.h>
+ 
+@@ -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);

=== added file 'debian/patches/1001--fix-linking-command.patch'
--- debian/patches/1001--fix-linking-command.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/1001--fix-linking-command.patch	2011-01-04 21:28:57 +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-0.4.9/multipathd/Makefile
+===================================================================
+--- multipath-tools-0.4.9.orig/multipathd/Makefile	2010-12-22 12:03:11.010874001 -0600
++++ multipath-tools-0.4.9/multipathd/Makefile	2010-12-22 12:03:19.274874001 -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:

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-01-04 21:28:57 +0000
@@ -0,0 +1,5 @@
+0001-blacklist-cciss-devices.patch
+0002-Make-user_friendly_names-compatible-to-multipath-too.patch
+0003-explicitly-include-posix_types.h.patch
+1000--set-umask-in-multipathd.patch
+1001--fix-linking-command.patch

=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2011-01-04 21:28:57 +0000
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] multipath-tools-boot.templates

=== added file 'debian/po/cs.po'
--- debian/po/cs.po	1970-01-01 00:00:00 +0000
+++ debian/po/cs.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,49 @@
+# Translation of multipath-tools debconf templates to Czech
+# Copyright (C) 2009 Debian Czech l10n team <[e-mail]>
+# This file is distributed under the same license as the multipath-tools package.
+#
+# Translators:
+# Tomas Fidler <[e-mail]>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools 0.4.8-15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2009-06-17 14:00+0200\n"
+"Last-Translator: Tomas Fidler <[e-mail]>\n"
+"Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "Změnilo se umístění getuid callout"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"Soubor /etc/multipath.conf v parametru  „getuid_callout“ odkazuje na  /sbin/"
+"scsi_id. Tento soubor se v udev verze 0.113 a vyšší přesunul do /lib/udev/"
+"scsi_id. Prosím aktualizujte Váš konfigura�ní soubor. Nejjednodušší cestou "
+"pro aktualizaci je odstranění parametru getuid_callout ze souboru /etc/"
+"multipath.conf."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"Nezapomeňte po provedené změně aktualizovat initramfs. V opa�ném případě se "
+"nemusí podařit start systému z multipath zařízení."

=== added file 'debian/po/de.po'
--- debian/po/de.po	1970-01-01 00:00:00 +0000
+++ debian/po/de.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,46 @@
+# Translation of multipath-tools debconf templates to German
+# Copyright (C) Helge Kreutzmann <[e-mail]>, 2008.
+# This file is distributed under the same license as the multipath-tools package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools 0.4.8-9\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2008-05-20 20:37+0200\n"
+"Last-Translator: Helge Kreutzmann <[e-mail]>\n"
+"Language-Team: de <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "Der Ort des Getuid-Callouts ist geändert worden"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"In Ihrer /etc/multipath.conf weist ein getuid_callout auf /sbin/scsi_id, das "
+"Programm wurde aber in Udev 0.113-1 nach /lib/udev/scsi_id verschoben. Bitte "
+"aktualisieren Sie Ihre Konfiguration. Dies erfolgt am besten durch das "
+"komplette Entfernen der Option getuid_callout."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"Vergessen Sie nicht, nach dieser Änderung Ihr Initramfs zu aktualisieren. "
+"Andernfalls könnte Ihr System nicht vom Multipath aus starten."

=== added file 'debian/po/es.po'
--- debian/po/es.po	1970-01-01 00:00:00 +0000
+++ debian/po/es.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,75 @@
+# multipath-tools po-debconf translation to Spanish.
+# Copyright (C) 2009 Software in the Public Interest.
+# This file is distributed under the same license as the multipath-tools package.
+#
+#  Changes:
+# - Initial translation
+#       Fernando González de Requena <[e-mail]>, 2009.
+#
+#
+#  Traductores, si no conoce el formato PO, merece la pena leer la
+#  documentación de gettext, especialmente las secciones dedicadas a este
+#  formato, por ejemplo ejecutando:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+#   http://www.debian.org/intl/spanish/
+#   especialmente las notas y normas de traducción en
+#   http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+#   /usr/share/doc/po-debconf/README-trans
+#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Si tiene dudas o consultas sobre esta traducción consulte con el último
+# traductor (campo Last-Translator) y ponga en copia a la lista de
+# traducción de Debian al español (<[e-mail]>)
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools 0.4.8-15\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2009-05-04 18:22+0200\n"
+"Last-Translator: Fernando González de Requena <[e-mail]>\n"
+"Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "Ha cambiado el lugar del «getuid callout»"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"Su archivo «/etc/multipath.conf» todavía tiene un campo «getuid_callout» "
+"apuntando a «/sbin/scsi_id», pero en udev 0.113-1 el binario se ha "
+"trasladado a «/lib/udev/scsi_id». Actualice su configuración. La mejor mejor "
+"manera de hacerlo es eliminar completamente la opción «getuid_callout»."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"No olvide actualizar su initramfs tras estos cambios. De otro modo su "
+"sistema podría no arrancar desde multipath."

=== added file 'debian/po/fr.po'
--- debian/po/fr.po	1970-01-01 00:00:00 +0000
+++ debian/po/fr.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,51 @@
+# translation of multipath-tools debconf templates to French
+# Copyright (C) Jean Guillou <[e-mail]>
+# This file is distributed under the same license as the multipath-tools package
+#
+# Jean Guillou <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2008-05-19 11:20+0200\n"
+"Last-Translator: Jean Guillou <[e-mail]>\n"
+"Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "Modification de la valeur du champ « getuid_callout »"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"Dans le fichier /etc/multipath.conf la valeur actuelle du champ « "
+"getuid_callout » est toujours /sbin/scsi_id mais l'adresse de l'exécutable "
+"est /lib/udev/scsi_id dans udev 0.113-1. Il est impératif de modifier le "
+"fichier de configuration. La solution suggérée est la suppression de cette "
+"option."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"Veuillez noter que vous devrez mettre à jour le système de fichiers initial "
+"en mémoire (« initramfs ») après ces changements. En l'absence de cette "
+"action, le système pourrait refuser de démarrer depuis un périphérique "
+"multichemins (« multipath »)."

=== added file 'debian/po/ja.po'
--- debian/po/ja.po	1970-01-01 00:00:00 +0000
+++ debian/po/ja.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,45 @@
+# Copyright (C) 2008-2009 Debian LVM Team <[e-mail]>
+# This file is distributed under the same license as the multipath-tools package.
+# Hideki Yamane (Debian-JP) <[e-mail]>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools 0.4.8-13\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2009-01-06 06:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
+"Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "getuid callout ��置�変更�れ���"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"/etc/multipath.conf �� /sbin/scsi_id を����る getuid_callout ��り��"
+"���イナリ� udev 0.113-1 � /lib/udeb/scsi_id �移動����。設定を更新�"
+"�����。完全� getuid_callout オプションを削除�る��一番良�方法��。"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"��変更を行��後� initramfs をアップデート�る�を忘れ��よ�������"
+"�。�������システム�マル�パス�ら起動����り��。"

=== added file 'debian/po/pt.po'
--- debian/po/pt.po	1970-01-01 00:00:00 +0000
+++ debian/po/pt.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,48 @@
+# translation of multipath-tools debconf to Portuguese
+# Copyright (C) 2008 Américo Monteiro
+# This file is distributed under the same license as the multipath-tools package.
+#
+# Américo Monteiro <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools 0.4.8-9\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2008-05-19 19:16+0100\n"
+"Last-Translator: Américo Monteiro <[e-mail]>\n"
+"Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "A localização de 'getuid callout' mudou"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"O seu /etc/multipath.conf ainda tem o getuid_callout a apontar para /sbin/"
+"scsi_id mas o binário foi movido para /lib/udev/scsi_id no udev 0.113-1. Por "
+"favor actualize a sua configuração. Isto fica melhor se remover "
+"completamente a opção getuid_callout."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"Não se esqueça de actualizar o seu initramfs após estas alterações. De outra "
+"maneira o seu sistema pode não arrancar a partir do multipath."

=== added file 'debian/po/ru.po'
--- debian/po/ru.po	1970-01-01 00:00:00 +0000
+++ debian/po/ru.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,50 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools 0.4.8-9\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2008-06-15 19:17+0400\n"
+"Last-Translator: Yuri Kozlov <[e-mail]>\n"
+"Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "Изменило�ь ра�положение getuid callout"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"В имеющем�� файле /etc/multipath.conf параметр getuid_callout указывает на /"
+"sbin/scsi_id, но �тот двоичный файл был перемещён в /lib/udev/scsi_id (пакет "
+"udev, вер�и� 0.113-1). Обновите вашу на�тройку. Лучше в�его вообще удалить "
+"параметр getuid_callout."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"�е забудьте обновить initramfs по�ле изменени�. Иначе �и�тема может не "
+"загрузить�� � помощью многоканального до�тупа."

=== added file 'debian/po/sv.po'
--- debian/po/sv.po	1970-01-01 00:00:00 +0000
+++ debian/po/sv.po	2011-01-04 21:28:57 +0000
@@ -0,0 +1,49 @@
+# translation of multipath-tools_0.4.8-10_sv.po to Swedish
+# Copyright (C) 2008
+# This file is distributed under the same license as the multipath-tools package.
+#
+# Martin Ã…gren <[e-mail]>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: multipath-tools_0.4.8-10_sv\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: 2008-07-23 20:58+0200\n"
+"Last-Translator: Martin Ã…gren <[e-mail]>\n"
+"Language-Team: Swedish <[e-mail]>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr "Sökvägen till getuid-utanropet har ändrats"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+"Din /etc/multipath.conf har fortfarande en getuid_callout som pekar på /sbin/"
+"scsi_id men binären har flyttats till /lib/udev/scsi_id i udev 0.113-1. "
+"Uppdatera din konfiguration. Detta görs bäst genom att ta bort "
+"getuid_callout-valet helt och hållet."
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""
+"Glöm inte att uppdatera din initramfs efter dessa ändringar. Annars kanske "
+"inte ditt system startar upp från multipath."

=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot	1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot	2011-01-04 21:28:57 +0000
@@ -0,0 +1,41 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2008-05-17 14:36+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid "The location of the getuid callout has changed"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Your /etc/multipath.conf still has a getuid_callout pointing to /sbin/"
+"scsi_id but the binary has moved to /lib/udev/scsi_id in udev 0.113-1. "
+"Please update your configuration. This is best done by removing the "
+"getuid_callout option entirely."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../multipath-tools-boot.templates:1001
+msgid ""
+"Don't forget to update your initramfs after these changes. Otherwise your "
+"system might not boot from multipath."
+msgstr ""

=== added directory 'debian/reportbug'
=== added file 'debian/reportbug/script'
--- debian/reportbug/script	1970-01-01 00:00:00 +0000
+++ debian/reportbug/script	2011-01-04 21:28:57 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+CONFIG_FILE=/etc/multipath.conf
+
+exec >&3
+
+if [ -e "$CONFIG_FILE" ]; then
+    printf "Contents of $CONFIG_FILE:\n"
+    grep  -Ev "^([[:space:]]*#|$)" $CONFIG_FILE
+else
+    printf "$CONFIG_FILE does not exist.\n"
+fi
+
+printf "\n"
+

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2011-01-04 21:28:57 +0000
@@ -0,0 +1,88 @@
+#!/usr/bin/make -f
+
+include /usr/share/quilt/quilt.make
+
+INITRAMFS=$(CURDIR)/debian/multipath-tools-boot/usr/share/initramfs-tools/
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM = install -s
+else
+        INSTALL_PROGRAM = install
+endif
+
+# Work around misp(el) linker bug:
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=10144
+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
+  OPTFLAGS = "OPTFLAGS=-pipe -Wall -Wunused -Wstrict-prototypes"
+endif
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+build: build-stamp
+build-stamp: patch
+	dh_testdir
+
+	$(MAKE) $(OPTFLAGS) LIB=lib
+
+	touch $@
+
+clean-tree:
+	$(MAKE) clean
+
+clean: clean-tree unpatch
+	dh_testdir
+	rm -f build-stamp
+	dh_clean
+	debconf-updatepo
+
+install:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	mkdir -p $(CURDIR)/debian/tmp/sbin
+	$(MAKE) install INSTALL_PROGRAM=$(INSTALL_PROGRAM) DESTDIR=$(CURDIR)/debian/tmp LIB=lib
+	install -m 755 debian/dmsetup_env $(CURDIR)/debian/tmp/lib/udev/
+	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/local-top \
+		$(INITRAMFS)/scripts/local-top/multipath
+	# reportbug:
+	for pkg in "multipath-tools" "multipath-tools-boot"; do \
+	    install -D -m 755 debian/reportbug/script debian/$${pkg}/usr/share/bug/$${pkg}/script; \
+	done
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+	dh_installinit -pmultipath-tools
+	dh_installinit -pmultipath-tools --name=multipath-tools-boot --no-start -- start 21 S .
+	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
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary:	binary-indep binary-arch
+.PHONY: binary binary-arch binary-indep unpack configure build clean 

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2011-01-04 21:28:57 +0000
@@ -0,0 +1,3 @@
+# format version number, currently 3; this line is compulsory!
+version=3
+http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-([\d\.]*)\.tar\.bz2

=== added directory 'getuid'
=== renamed directory 'getuid' => 'getuid.moved'
=== added file 'getuid/usb_id'
--- getuid/usb_id	1970-01-01 00:00:00 +0000
+++ getuid/usb_id	2011-01-04 21:28:57 +0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# copy in /bin and add this line to a device block in multipath.conf :
+# getuid_callout          "/bin/usb_id %n"
+#
+cd /sys/block/$1 && cd $(ls -l device|cut -d">" -f2) && cd ../../../.. && cat serial

=== added directory 'kpartx'
=== renamed directory 'kpartx' => 'kpartx.moved'
=== added file 'kpartx/ChangeLog'
--- kpartx/ChangeLog	1970-01-01 00:00:00 +0000
+++ kpartx/ChangeLog	2011-01-04 21:28:57 +0000
@@ -0,0 +1,9 @@
+002:
+* convert to kpartx name everywhere
+* remove all HDGEO ioctl code
+* now work with files by mapping loops on the fly
+* merged and massage lopart.[ch] from lomount.[ch]
+  (due credit to original author here : hpa ?)
+* added a fn find_loop_by_file in lopart.[ch]
+001:
+* Initial release

=== added file 'kpartx/Makefile'
--- kpartx/Makefile	1970-01-01 00:00:00 +0000
+++ kpartx/Makefile	2011-01-04 21:28:57 +0000
@@ -0,0 +1,35 @@
+# Makefile
+#
+# Copyright (C) 2003 Christophe Varoqui, <[e-mail]>
+#
+include ../Makefile.inc
+
+CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+
+LDFLAGS = -ldevmapper
+OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
+       gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o
+EXEC = kpartx
+
+all: $(EXEC)
+
+$(EXEC): $(OBJS)
+	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+	
+install: $(EXEC) $(EXEC).8
+	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
+	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
+	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
+	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
+
+uninstall:
+	rm -f $(DESTDIR)$(bindir)/$(EXEC)
+	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
+
+clean:
+	rm -f core *.o $(EXEC) *.gz

=== added file 'kpartx/README'
--- kpartx/README	1970-01-01 00:00:00 +0000
+++ kpartx/README	2011-01-04 21:28:57 +0000
@@ -0,0 +1,9 @@
+This version of partx is intented to be build 
+static against klibc.
+
+It creates partitions as device maps.
+
+With due respect to the original authors,
+
+have fun,
+cvaroqui

=== added file 'kpartx/bsd.c'
--- kpartx/bsd.c	1970-01-01 00:00:00 +0000
+++ kpartx/bsd.c	2011-01-04 21:28:57 +0000
@@ -0,0 +1,114 @@
+#include "kpartx.h"
+#include <stdio.h>
+
+#define BSD_DISKMAGIC	(0x82564557UL)	/* The disk magic number */
+#define XBSD_MAXPARTITIONS	16
+#define BSD_FS_UNUSED		0
+
+struct bsd_disklabel {
+	unsigned int	d_magic;	/* the magic number */
+	short int	d_type;		/* drive type */
+	short int	d_subtype;	/* controller/d_type specific */
+	char	d_typename[16];		/* type name, e.g. "eagle" */
+	char	d_packname[16];		/* pack identifier */
+	unsigned int	d_secsize;	/* # of bytes per sector */
+	unsigned int	d_nsectors;	/* # of data sectors per track */
+	unsigned int	d_ntracks;	/* # of tracks per cylinder */
+	unsigned int	d_ncylinders;	/* # of data cylinders per unit */
+	unsigned int	d_secpercyl;	/* # of data sectors per cylinder */
+	unsigned int	d_secperunit;	/* # of data sectors per unit */
+	unsigned short	d_sparespertrack;/* # of spare sectors per track */
+	unsigned short	d_sparespercyl;	/* # of spare sectors per cylinder */
+	unsigned int	d_acylinders;	/* # of alt. cylinders per unit */
+	unsigned short	d_rpm;		/* rotational speed */
+	unsigned short	d_interleave;	/* hardware sector interleave */
+	unsigned short	d_trackskew;	/* sector 0 skew, per track */
+	unsigned short	d_cylskew;	/* sector 0 skew, per cylinder */
+	unsigned int	d_headswitch;	/* head switch time, usec */
+	unsigned int	d_trkseek;	/* track-to-track seek, usec */
+	unsigned int	d_flags;	/* generic flags */
+	unsigned int	d_drivedata[5];	/* drive-type specific information */
+	unsigned int	d_spare[5];	/* reserved for future use */
+	unsigned int	d_magic2;	/* the magic number (again) */
+	unsigned short	d_checksum;	/* xor of data incl. partitions */
+
+			/* filesystem and partition information: */
+	unsigned short	d_npartitions;	/* number of partitions in following */
+	unsigned int	d_bbsize;	/* size of boot area at sn0, bytes */
+	unsigned int	d_sbsize;	/* max size of fs superblock, bytes */
+	struct	bsd_partition {		/* the partition table */
+		unsigned int	p_size;	  /* number of sectors in partition */
+		unsigned int	p_offset; /* starting sector */
+		unsigned int	p_fsize;  /* filesystem basic fragment size */
+		unsigned char	p_fstype; /* filesystem type, see below */
+		unsigned char	p_frag;	  /* filesystem fragments per block */
+		unsigned short	p_cpg;	  /* filesystem cylinders per group */
+	} d_partitions[XBSD_MAXPARTITIONS];/* actually may be more */
+};
+
+int
+read_bsd_pt(int fd, struct slice all, struct slice *sp, int ns) {
+	struct bsd_disklabel *l;
+	struct bsd_partition *p;
+	unsigned int offset = all.start, end;
+	int max_partitions;
+	char *bp;
+	int n = 0, i, j;
+
+	bp = getblock(fd, offset+1);    /* 1 sector suffices */
+	if (bp == NULL)
+		return -1;
+
+	l = (struct bsd_disklabel *) bp;
+	if (l->d_magic != BSD_DISKMAGIC)
+		return -1;
+
+	max_partitions = 16;
+	if (l->d_npartitions < max_partitions)
+		max_partitions = l->d_npartitions;
+	for (p = l->d_partitions; p - l->d_partitions <  max_partitions; p++) {
+		if (p->p_fstype == BSD_FS_UNUSED)
+			/* nothing */;
+		else if (n < ns) {
+			sp[n].start = p->p_offset;
+			sp[n].size = p->p_size;
+			n++;
+		} else {
+			fprintf(stderr,
+				"bsd_partition: too many slices\n");
+			break;
+		}
+	}
+	/*
+	 * Convention has it that the bsd disklabel will always have
+	 * the 'c' partition spanning the entire disk.
+	 * So we have to check for contained slices.
+	 */
+	for(i = 0; i < n; i++) {
+		if (sp[i].size == 0)
+			continue;
+
+		end = sp[i].start + sp[i].size;
+		for(j = 0; j < n; j ++) {
+			if ( i == j )
+				continue;
+			if (sp[j].size == 0)
+				continue;
+
+			if (sp[i].start < sp[j].start) {
+				if (end > sp[j].start &&
+				    end < sp[j].start + sp[j].size) {
+					/* Invalid slice */
+					fprintf(stderr,
+						"bsd_disklabel: slice %d overlaps with %d\n", i , j);
+					sp[i].size = 0;
+				}
+			} else {
+				if (end <= sp[j].start + sp[j].size) {
+					sp[i].container = j + 1;
+				}
+			}
+		}
+	}
+	return n;
+}

=== added file 'kpartx/byteorder.h'
--- kpartx/byteorder.h	1970-01-01 00:00:00 +0000
+++ kpartx/byteorder.h	2011-01-04 21:28:57 +0000
@@ -0,0 +1,25 @@
+#ifndef BYTEORDER_H_INCLUDED
+#define BYTEORDER_H_INCLUDED
+
+#ifdef __linux__
+#  include <endian.h>
+#  include <byteswap.h>
+#else
+#  error unsupported
+#endif
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+#  define le16_to_cpu(x) (x)
+#  define be16_to_cpu(x) bswap_16(x)
+#  define le32_to_cpu(x) (x)
+#  define be32_to_cpu(x) bswap_32(x)
+#elif BYTE_ORDER == BIG_ENDIAN
+#  define le16_to_cpu(x) bswap_16(x)
+#  define be16_to_cpu(x) (x)
+#  define le32_to_cpu(x) bswap_32(x)
+#  define be32_to_cpu(x) (x)
+#else
+#  error unsupported
+#endif
+
+#endif				/* BYTEORDER_H_INCLUDED */

=== added file 'kpartx/crc32.c'
--- kpartx/crc32.c	1970-01-01 00:00:00 +0000
+++ kpartx/crc32.c	2011-01-04 21:28:57 +0000
@@ -0,0 +1,393 @@
+/* 
+ * crc32.c
+ * This code is in the public domain; copyright abandoned.
+ * Liability for non-performance of this code is limited to the amount
+ * you paid for it.  Since it is distributed for free, your refund will
+ * be very very small.  If it breaks, you get to keep both pieces.
+ */
+
+#include "crc32.h"
+
+#if __GNUC__ >= 3	/* 2.x has "attribute", but only 3.0 has "pure */
+#define attribute(x) __attribute__(x)
+#else
+#define attribute(x)
+#endif
+
+/*
+ * There are multiple 16-bit CRC polynomials in common use, but this is
+ * *the* standard CRC-32 polynomial, first popularized by Ethernet.
+ * x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x^1+x^0
+ */
+#define CRCPOLY_LE 0xedb88320
+#define CRCPOLY_BE 0x04c11db7
+
+/* How many bits at a time to use.  Requires a table of 4<<CRC_xx_BITS bytes. */
+/* For less performance-sensitive, use 4 */
+#define CRC_LE_BITS 8
+#define CRC_BE_BITS 8
+
+/*
+ * Little-endian CRC computation.  Used with serial bit streams sent
+ * lsbit-first.  Be sure to use cpu_to_le32() to append the computed CRC.
+ */
+#if CRC_LE_BITS > 8 || CRC_LE_BITS < 1 || CRC_LE_BITS & CRC_LE_BITS-1
+# error CRC_LE_BITS must be a power of 2 between 1 and 8
+#endif
+
+#if CRC_LE_BITS == 1
+/*
+ * In fact, the table-based code will work in this case, but it can be
+ * simplified by inlining the table in ?: form.
+ */
+#define crc32init_le()
+#define crc32cleanup_le()
+/**
+ * crc32_le() - Calculate bitwise little-endian Ethernet AUTODIN II CRC32
+ * @crc - seed value for computation.  ~0 for Ethernet, sometimes 0 for
+ *        other uses, or the previous crc32 value if computing incrementally.
+ * @p   - pointer to buffer over which CRC is run
+ * @len - length of buffer @p
+ * 
+ */
+uint32_t attribute((pure)) crc32_le(uint32_t crc, unsigned char const *p, size_t len)
+{
+	int i;
+	while (len--) {
+		crc ^= *p++;
+		for (i = 0; i < 8; i++)
+			crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY_LE : 0);
+	}
+	return crc;
+}
+#else				/* Table-based approach */
+
+static uint32_t *crc32table_le;
+/**
+ * crc32init_le() - allocate and initialize LE table data
+ *
+ * crc is the crc of the byte i; other entries are filled in based on the
+ * fact that crctable[i^j] = crctable[i] ^ crctable[j].
+ *
+ */
+static int
+crc32init_le(void)
+{
+	unsigned i, j;
+	uint32_t crc = 1;
+
+	crc32table_le =
+		malloc((1 << CRC_LE_BITS) * sizeof(uint32_t));
+	if (!crc32table_le)
+		return 1;
+	crc32table_le[0] = 0;
+
+	for (i = 1 << (CRC_LE_BITS - 1); i; i >>= 1) {
+		crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY_LE : 0);
+		for (j = 0; j < 1 << CRC_LE_BITS; j += 2 * i)
+			crc32table_le[i + j] = crc ^ crc32table_le[j];
+	}
+	return 0;
+}
+
+/**
+ * crc32cleanup_le(): free LE table data
+ */
+static void
+crc32cleanup_le(void)
+{
+	if (crc32table_le) free(crc32table_le);
+	crc32table_le = NULL;
+}
+
+/**
+ * crc32_le() - Calculate bitwise little-endian Ethernet AUTODIN II CRC32
+ * @crc - seed value for computation.  ~0 for Ethernet, sometimes 0 for
+ *        other uses, or the previous crc32 value if computing incrementally.
+ * @p   - pointer to buffer over which CRC is run
+ * @len - length of buffer @p
+ * 
+ */
+uint32_t attribute((pure)) crc32_le(uint32_t crc, unsigned char const *p, size_t len)
+{
+	while (len--) {
+# if CRC_LE_BITS == 8
+		crc = (crc >> 8) ^ crc32table_le[(crc ^ *p++) & 255];
+# elif CRC_LE_BITS == 4
+		crc ^= *p++;
+		crc = (crc >> 4) ^ crc32table_le[crc & 15];
+		crc = (crc >> 4) ^ crc32table_le[crc & 15];
+# elif CRC_LE_BITS == 2
+		crc ^= *p++;
+		crc = (crc >> 2) ^ crc32table_le[crc & 3];
+		crc = (crc >> 2) ^ crc32table_le[crc & 3];
+		crc = (crc >> 2) ^ crc32table_le[crc & 3];
+		crc = (crc >> 2) ^ crc32table_le[crc & 3];
+# endif
+	}
+	return crc;
+}
+#endif
+
+/*
+ * Big-endian CRC computation.  Used with serial bit streams sent
+ * msbit-first.  Be sure to use cpu_to_be32() to append the computed CRC.
+ */
+#if CRC_BE_BITS > 8 || CRC_BE_BITS < 1 || CRC_BE_BITS & CRC_BE_BITS-1
+# error CRC_BE_BITS must be a power of 2 between 1 and 8
+#endif
+
+#if CRC_BE_BITS == 1
+/*
+ * In fact, the table-based code will work in this case, but it can be
+ * simplified by inlining the table in ?: form.
+ */
+#define crc32init_be()
+#define crc32cleanup_be()
+
+/**
+ * crc32_be() - Calculate bitwise big-endian Ethernet AUTODIN II CRC32
+ * @crc - seed value for computation.  ~0 for Ethernet, sometimes 0 for
+ *        other uses, or the previous crc32 value if computing incrementally.
+ * @p   - pointer to buffer over which CRC is run
+ * @len - length of buffer @p
+ * 
+ */
+uint32_t attribute((pure)) crc32_be(uint32_t crc, unsigned char const *p, size_t len)
+{
+	int i;
+	while (len--) {
+		crc ^= *p++ << 24;
+		for (i = 0; i < 8; i++)
+			crc =
+			    (crc << 1) ^ ((crc & 0x80000000) ? CRCPOLY_BE :
+					  0);
+	}
+	return crc;
+}
+
+#else				/* Table-based approach */
+static uint32_t *crc32table_be;
+
+/**
+ * crc32init_be() - allocate and initialize BE table data
+ */
+static int
+crc32init_be(void)
+{
+	unsigned i, j;
+	uint32_t crc = 0x80000000;
+
+	crc32table_be =
+		malloc((1 << CRC_BE_BITS) * sizeof(uint32_t));
+	if (!crc32table_be)
+		return 1;
+	crc32table_be[0] = 0;
+
+	for (i = 1; i < 1 << CRC_BE_BITS; i <<= 1) {
+		crc = (crc << 1) ^ ((crc & 0x80000000) ? CRCPOLY_BE : 0);
+		for (j = 0; j < i; j++)
+			crc32table_be[i + j] = crc ^ crc32table_be[j];
+	}
+	return 0;
+}
+
+/**
+ * crc32cleanup_be(): free BE table data
+ */
+static void
+crc32cleanup_be(void)
+{
+	if (crc32table_be) free(crc32table_be);
+	crc32table_be = NULL;
+}
+
+
+/**
+ * crc32_be() - Calculate bitwise big-endian Ethernet AUTODIN II CRC32
+ * @crc - seed value for computation.  ~0 for Ethernet, sometimes 0 for
+ *        other uses, or the previous crc32 value if computing incrementally.
+ * @p   - pointer to buffer over which CRC is run
+ * @len - length of buffer @p
+ * 
+ */
+uint32_t attribute((pure)) crc32_be(uint32_t crc, unsigned char const *p, size_t len)
+{
+	while (len--) {
+# if CRC_BE_BITS == 8
+		crc = (crc << 8) ^ crc32table_be[(crc >> 24) ^ *p++];
+# elif CRC_BE_BITS == 4
+		crc ^= *p++ << 24;
+		crc = (crc << 4) ^ crc32table_be[crc >> 28];
+		crc = (crc << 4) ^ crc32table_be[crc >> 28];
+# elif CRC_BE_BITS == 2
+		crc ^= *p++ << 24;
+		crc = (crc << 2) ^ crc32table_be[crc >> 30];
+		crc = (crc << 2) ^ crc32table_be[crc >> 30];
+		crc = (crc << 2) ^ crc32table_be[crc >> 30];
+		crc = (crc << 2) ^ crc32table_be[crc >> 30];
+# endif
+	}
+	return crc;
+}
+#endif
+
+/*
+ * A brief CRC tutorial.
+ *
+ * A CRC is a long-division remainder.  You add the CRC to the message,
+ * and the whole thing (message+CRC) is a multiple of the given
+ * CRC polynomial.  To check the CRC, you can either check that the
+ * CRC matches the recomputed value, *or* you can check that the
+ * remainder computed on the message+CRC is 0.  This latter approach
+ * is used by a lot of hardware implementations, and is why so many
+ * protocols put the end-of-frame flag after the CRC.
+ *
+ * It's actually the same long division you learned in school, except that
+ * - We're working in binary, so the digits are only 0 and 1, and
+ * - When dividing polynomials, there are no carries.  Rather than add and
+ *   subtract, we just xor.  Thus, we tend to get a bit sloppy about
+ *   the difference between adding and subtracting.
+ *
+ * A 32-bit CRC polynomial is actually 33 bits long.  But since it's
+ * 33 bits long, bit 32 is always going to be set, so usually the CRC
+ * is written in hex with the most significant bit omitted.  (If you're
+ * familiar with the IEEE 754 floating-point format, it's the same idea.)
+ *
+ * Note that a CRC is computed over a string of *bits*, so you have
+ * to decide on the endianness of the bits within each byte.  To get
+ * the best error-detecting properties, this should correspond to the
+ * order they're actually sent.  For example, standard RS-232 serial is
+ * little-endian; the most significant bit (sometimes used for parity)
+ * is sent last.  And when appending a CRC word to a message, you should
+ * do it in the right order, matching the endianness.
+ *
+ * Just like with ordinary division, the remainder is always smaller than
+ * the divisor (the CRC polynomial) you're dividing by.  Each step of the
+ * division, you take one more digit (bit) of the dividend and append it
+ * to the current remainder.  Then you figure out the appropriate multiple
+ * of the divisor to subtract to being the remainder back into range.
+ * In binary, it's easy - it has to be either 0 or 1, and to make the
+ * XOR cancel, it's just a copy of bit 32 of the remainder.
+ *
+ * When computing a CRC, we don't care about the quotient, so we can
+ * throw the quotient bit away, but subtract the appropriate multiple of
+ * the polynomial from the remainder and we're back to where we started,
+ * ready to process the next bit.
+ *
+ * A big-endian CRC written this way would be coded like:
+ * for (i = 0; i < input_bits; i++) {
+ * 	multiple = remainder & 0x80000000 ? CRCPOLY : 0;
+ * 	remainder = (remainder << 1 | next_input_bit()) ^ multiple;
+ * }
+ * Notice how, to get at bit 32 of the shifted remainder, we look
+ * at bit 31 of the remainder *before* shifting it.
+ *
+ * But also notice how the next_input_bit() bits we're shifting into
+ * the remainder don't actually affect any decision-making until
+ * 32 bits later.  Thus, the first 32 cycles of this are pretty boring.
+ * Also, to add the CRC to a message, we need a 32-bit-long hole for it at
+ * the end, so we have to add 32 extra cycles shifting in zeros at the
+ * end of every message,
+ *
+ * So the standard trick is to rearrage merging in the next_input_bit()
+ * until the moment it's needed.  Then the first 32 cycles can be precomputed,
+ * and merging in the final 32 zero bits to make room for the CRC can be
+ * skipped entirely.
+ * This changes the code to:
+ * for (i = 0; i < input_bits; i++) {
+ *      remainder ^= next_input_bit() << 31;
+ * 	multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
+ * 	remainder = (remainder << 1) ^ multiple;
+ * }
+ * With this optimization, the little-endian code is simpler:
+ * for (i = 0; i < input_bits; i++) {
+ *      remainder ^= next_input_bit();
+ * 	multiple = (remainder & 1) ? CRCPOLY : 0;
+ * 	remainder = (remainder >> 1) ^ multiple;
+ * }
+ *
+ * Note that the other details of endianness have been hidden in CRCPOLY
+ * (which must be bit-reversed) and next_input_bit().
+ *
+ * However, as long as next_input_bit is returning the bits in a sensible
+ * order, we can actually do the merging 8 or more bits at a time rather
+ * than one bit at a time:
+ * for (i = 0; i < input_bytes; i++) {
+ * 	remainder ^= next_input_byte() << 24;
+ * 	for (j = 0; j < 8; j++) {
+ * 		multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
+ * 		remainder = (remainder << 1) ^ multiple;
+ * 	}
+ * }
+ * Or in little-endian:
+ * for (i = 0; i < input_bytes; i++) {
+ * 	remainder ^= next_input_byte();
+ * 	for (j = 0; j < 8; j++) {
+ * 		multiple = (remainder & 1) ? CRCPOLY : 0;
+ * 		remainder = (remainder << 1) ^ multiple;
+ * 	}
+ * }
+ * If the input is a multiple of 32 bits, you can even XOR in a 32-bit
+ * word at a time and increase the inner loop count to 32.
+ *
+ * You can also mix and match the two loop styles, for example doing the
+ * bulk of a message byte-at-a-time and adding bit-at-a-time processing
+ * for any fractional bytes at the end.
+ *
+ * The only remaining optimization is to the byte-at-a-time table method.
+ * Here, rather than just shifting one bit of the remainder to decide
+ * in the correct multiple to subtract, we can shift a byte at a time.
+ * This produces a 40-bit (rather than a 33-bit) intermediate remainder,
+ * but again the multiple of the polynomial to subtract depends only on
+ * the high bits, the high 8 bits in this case.  
+ *
+ * The multile we need in that case is the low 32 bits of a 40-bit
+ * value whose high 8 bits are given, and which is a multiple of the
+ * generator polynomial.  This is simply the CRC-32 of the given
+ * one-byte message.
+ *
+ * Two more details: normally, appending zero bits to a message which
+ * is already a multiple of a polynomial produces a larger multiple of that
+ * polynomial.  To enable a CRC to detect this condition, it's common to
+ * invert the CRC before appending it.  This makes the remainder of the
+ * message+crc come out not as zero, but some fixed non-zero value.
+ *
+ * The same problem applies to zero bits prepended to the message, and
+ * a similar solution is used.  Instead of starting with a remainder of
+ * 0, an initial remainder of all ones is used.  As long as you start
+ * the same way on decoding, it doesn't make a difference.
+ */
+
+
+/**
+ * init_crc32(): generates CRC32 tables
+ * 
+ * On successful initialization, use count is increased.
+ * This guarantees that the library functions will stay resident
+ * in memory, and prevents someone from 'rmmod crc32' while
+ * a driver that needs it is still loaded.
+ * This also greatly simplifies drivers, as there's no need
+ * to call an initialization/cleanup function from each driver.
+ * Since crc32.o is a library module, there's no requirement
+ * that the user can unload it.
+ */
+int
+init_crc32(void)
+{
+	int rc1, rc2, rc;
+	rc1 = crc32init_le();
+	rc2 = crc32init_be();
+	rc = rc1 || rc2;
+	return rc;
+}
+
+/**
+ * cleanup_crc32(): frees crc32 data when no longer needed
+ */
+void
+cleanup_crc32(void)
+{
+	crc32cleanup_le();
+	crc32cleanup_be();
+}

=== added file 'kpartx/crc32.h'
--- kpartx/crc32.h	1970-01-01 00:00:00 +0000
+++ kpartx/crc32.h	2011-01-04 21:28:57 +0000
@@ -0,0 +1,19 @@
+/*
+ * crc32.h
+ */
+#ifndef _CRC32_H
+#define _CRC32_H
+
+#include <inttypes.h>
+#include <stdlib.h>
+
+extern int init_crc32(void);
+extern void cleanup_crc32(void);
+extern uint32_t  crc32_le(uint32_t crc, unsigned char const *p, size_t len);
+extern uint32_t  crc32_be(uint32_t crc, unsigned char const *p, size_t len);
+
+#define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)data, length)
+#define ether_crc_le(length, data) crc32_le(~0, data, length)
+#define ether_crc(length, data)    crc32_be(~0, data, length)
+
+#endif /* _CRC32_H */

=== added file 'kpartx/dasd.c'
--- kpartx/dasd.c	1970-01-01 00:00:00 +0000
+++ kpartx/dasd.c	2011-01-04 21:28:57 +0000
@@ -0,0 +1,262 @@
+/*
+ * dasd.c
+ *
+ * IBM DASD partition table handling.
+ *
+ * Mostly taken from drivers/s390/block/dasd.c
+ *
+ * Copyright (c) 2005, Hannes Reinecke, SUSE Linux Products GmbH
+ * Copyright IBM Corporation, 2009
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ * USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <linux/hdreg.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <libdevmapper.h>
+#include "devmapper.h"
+#include "kpartx.h"
+#include "byteorder.h"
+#include "dasd.h"
+
+unsigned long long sectors512(unsigned long long sectors, int blocksize)
+{
+	return sectors * (blocksize >> 9);
+}
+
+/*
+ */
+int 
+read_dasd_pt(int fd, struct slice all, struct slice *sp, int ns)
+{
+	int retval = -1;
+	int blocksize;
+	uint64_t disksize;
+	uint64_t offset, size, fmt_size;
+	dasd_information_t info;
+	struct hd_geometry geo;
+	char type[5] = {0,};
+	volume_label_t vlabel;
+	unsigned char *data = NULL;
+	uint64_t blk;
+	int fd_dasd = -1;
+	struct stat sbuf;
+	dev_t dev;
+	char *devname;
+	char pathname[256];
+
+	if (fd < 0) {
+		return -1;
+	}
+
+	if (fstat(fd, &sbuf) == -1) {
+		return -1;
+	}
+
+	devname = dm_mapname(major(sbuf.st_rdev), minor(sbuf.st_rdev));
+
+	if (devname != NULL) {
+		/* We were passed a handle to a dm device.
+		 * Get the first target and operate on that instead.
+		 */
+		if (!(dev = dm_get_first_dep(devname))) {
+			free(devname);
+			return -1;
+		}
+		free(devname);
+
+		if ((unsigned int)major(dev) != 94) {
+			/* Not a DASD */
+			return -1;
+		}
+
+		/*
+		 * Hard to believe, but there's no simple way to translate
+		 * major/minor into an openable device file, so we have
+		 * to create one for ourselves.
+		 */
+		
+		sprintf(pathname, "/dev/.kpartx-node-%u-%u",
+			(unsigned int)major(dev), (unsigned int)minor(dev));
+		if ((fd_dasd = open(pathname, O_RDONLY)) == -1) {
+			/* Devicenode does not exist. Try to create one */
+			if (mknod(pathname, 0600 | S_IFBLK, dev) == -1) {
+				/* Couldn't create a device node */
+				return -1;
+			}
+			fd_dasd = open(pathname, O_RDONLY);
+			/*
+			 * The file will vanish when the last process (we)
+			 * has ceased to access it.
+			 */
+			unlink(pathname);
+		}
+		if (!fd_dasd) {
+			/* Couldn't open the device */
+			return -1;
+		}
+	} else {
+		fd_dasd = fd;
+	}
+
+	if (ioctl(fd_dasd, BIODASDINFO, (unsigned long)&info) != 0) {
+		goto out;
+	}
+
+	if (ioctl(fd_dasd, HDIO_GETGEO, (unsigned long)&geo) != 0) {
+		goto out;
+	}
+
+	if (ioctl(fd_dasd, BLKGETSIZE64, &disksize) != 0)
+		goto out;
+	disksize >>= 9;
+
+	if (ioctl(fd_dasd, BLKSSZGET, &blocksize) != 0)
+		goto out;
+
+	if (blocksize < 512 || blocksize > 4096)
+		goto out;
+
+	/*
+	 * Get volume label, extract name and type.
+	 */
+
+	if (!(data = (unsigned char *)malloc(blocksize)))
+		goto out;
+
+
+	if (lseek(fd_dasd, info.label_block * blocksize, SEEK_SET) == -1)
+		goto out;
+	if (read(fd_dasd, data, blocksize) == -1) {
+		perror("read");
+		goto out;
+	}
+
+	if ((!info.FBA_layout) && (!strcmp(info.type, "ECKD")))
+		memcpy (&vlabel, data, sizeof(vlabel));
+	else {
+		bzero(&vlabel,4);
+		memcpy (&vlabel.vollbl, data, sizeof(vlabel) - 4);
+	}
+	vtoc_ebcdic_dec(vlabel.vollbl, type, 4);
+
+	/*
+	 * Three different types: CMS1, VOL1 and LNX1/unlabeled
+	 */
+	if (strncmp(type, "CMS1", 4) == 0) {
+		/*
+		 * VM style CMS1 labeled disk
+		 */
+		unsigned int *label = (unsigned int *) &vlabel;
+
+		blocksize = label[4];
+		if (label[14] != 0) {
+			/* disk is reserved minidisk */
+			offset = label[14];
+			size   = sectors512(label[8] - 1, blocksize);
+		} else {
+			offset = info.label_block + 1;
+			size   = sectors512(label[8], blocksize);
+		}
+		sp[0].start = sectors512(offset, blocksize);
+		sp[0].size  = size - sp[0].start;
+		retval = 1;
+	} else if ((strncmp(type, "VOL1", 4) == 0) &&
+		(!info.FBA_layout) && (!strcmp(info.type, "ECKD"))) {
+		/*
+		 * New style VOL1 labeled disk
+		 */
+		int counter;
+
+		/* get block number and read then go through format1 labels */
+		blk = cchhb2blk(&vlabel.vtoc, &geo) + 1;
+		counter = 0;
+		if (lseek(fd_dasd, blk * blocksize, SEEK_SET) == -1)
+			goto out;
+
+		while (read(fd_dasd, data, blocksize) != -1) {
+			format1_label_t f1;
+
+			memcpy(&f1, data, sizeof(format1_label_t));
+
+			/* skip FMT4 / FMT5 / FMT7 labels */
+			if (EBCtoASC[f1.DS1FMTID] == '4'
+			    || EBCtoASC[f1.DS1FMTID] == '5'
+			    || EBCtoASC[f1.DS1FMTID] == '7'
+			    || EBCtoASC[f1.DS1FMTID] == '9') {
+			        blk++;
+				continue;
+			}
+
+			/* only FMT1 and FMT8 valid at this point */
+			if (EBCtoASC[f1.DS1FMTID] != '1' &&
+			    EBCtoASC[f1.DS1FMTID] != '8')
+				break;
+
+			/* OK, we got valid partition data */
+		        offset = cchh2blk(&f1.DS1EXT1.llimit, &geo);
+			size  = cchh2blk(&f1.DS1EXT1.ulimit, &geo) -
+				offset + geo.sectors;
+			sp[counter].start = sectors512(offset, blocksize);
+			sp[counter].size  = sectors512(size, blocksize);
+			counter++;
+			blk++;
+		}
+		retval = counter;
+	} else {
+		/*
+		 * Old style LNX1 or unlabeled disk
+		 */
+		if (strncmp(type, "LNX1", 4) == 0) {
+			if (vlabel.ldl_version == 0xf2) {
+				fmt_size = sectors512(vlabel.formatted_blocks,
+						      blocksize);
+			} else if (!strcmp(info.type, "ECKD")) {
+				/* formated w/o large volume support */
+				fmt_size = geo.cylinders * geo.heads
+					* geo.sectors * (blocksize >> 9);
+			} else {
+				/* old label and no usable disk geometry
+				 * (e.g. DIAG) */
+				fmt_size = disksize;
+			}
+			size = disksize;
+			if (fmt_size < size)
+				size = fmt_size;
+		} else
+			size = disksize;
+
+		sp[0].start = sectors512(info.label_block + 1, blocksize);
+		sp[0].size  = size - sp[0].start;
+		retval = 1;
+	}
+
+ out:
+	if (data != NULL)
+		free(data);
+	if (fd_dasd != -1 && fd_dasd != fd)
+		close(fd_dasd);
+	return retval;
+}

=== added file 'kpartx/dasd.h'
--- kpartx/dasd.h	1970-01-01 00:00:00 +0000
+++ kpartx/dasd.h	2011-01-04 21:28:57 +0000
@@ -0,0 +1,293 @@
+/*
+ * dasd.h
+ *
+ * IBM DASD partition table handling.
+ *
+ * Mostly taken from drivers/s390/block/dasd.c
+ *
+ * Copyright (c) 2005, Hannes Reinecke, SUSE Linux Products GmbH
+ * Copyright IBM Corporation, 2009
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
+ * USA.
+ */
+
+#ifndef _DASD_H
+#define _DASD_H
+
+typedef struct ttr 
+{
+        uint16_t tt;
+        uint8_t  r;
+} __attribute__ ((packed)) ttr_t;
+
+typedef struct cchhb 
+{
+        uint16_t cc;
+        uint16_t hh;
+        uint8_t b;
+} __attribute__ ((packed)) cchhb_t;
+
+typedef struct cchh 
+{
+        uint16_t cc;
+        uint16_t hh;
+} __attribute__ ((packed)) cchh_t;
+
+typedef struct labeldate 
+{
+        uint8_t  year;
+        uint16_t day;
+} __attribute__ ((packed)) labeldate_t;
+
+
+typedef struct volume_label 
+{
+        char volkey[4];         /* volume key = volume label                 */
+	char vollbl[4];	        /* volume label                              */
+	char volid[6];	        /* volume identifier                         */
+	uint8_t security;	        /* security byte                             */
+	cchhb_t vtoc;           /* VTOC address                              */
+	char res1[5];	        /* reserved                                  */
+        char cisize[4];	        /* CI-size for FBA,...                       */
+                                /* ...blanks for CKD                         */
+	char blkperci[4];       /* no of blocks per CI (FBA), blanks for CKD */
+	char labperci[4];       /* no of labels per CI (FBA), blanks for CKD */
+	char res2[4];	        /* reserved                                  */
+	char lvtoc[14];	        /* owner code for LVTOC                      */
+	char res3[28];	        /* reserved                                  */
+	char ldl_version;       /* version number, valid for ldl format      */
+	uint64_t formatted_blocks; /* valid when ldl_version >= f2           */
+} __attribute__ ((packed)) volume_label_t;
+
+
+typedef struct extent 
+{
+        uint8_t  typeind;          /* extent type indicator                     */
+        uint8_t  seqno;            /* extent sequence number                    */
+        cchh_t llimit;          /* starting point of this extent             */
+        cchh_t ulimit;          /* ending point of this extent               */
+} __attribute__ ((packed)) extent_t;
+
+
+typedef struct dev_const 
+{
+        uint16_t DS4DSCYL;           /* number of logical cyls                  */
+        uint16_t DS4DSTRK;           /* number of tracks in a logical cylinder  */
+        uint16_t DS4DEVTK;           /* device track length                     */
+        uint8_t  DS4DEVI;            /* non-last keyed record overhead          */
+        uint8_t  DS4DEVL;            /* last keyed record overhead              */
+        uint8_t  DS4DEVK;            /* non-keyed record overhead differential  */
+        uint8_t  DS4DEVFG;           /* flag byte                               */
+        uint16_t DS4DEVTL;           /* device tolerance                        */
+        uint8_t  DS4DEVDT;           /* number of DSCB's per track              */
+        uint8_t  DS4DEVDB;           /* number of directory blocks per track    */
+} __attribute__ ((packed)) dev_const_t;
+
+
+typedef struct format1_label 
+{
+	char  DS1DSNAM[44];       /* data set name                           */
+	uint8_t  DS1FMTID;           /* format identifier                       */
+	char  DS1DSSN[6];         /* data set serial number                  */
+	uint16_t DS1VOLSQ;           /* volume sequence number                  */
+	labeldate_t DS1CREDT;     /* creation date: ydd                      */
+	labeldate_t DS1EXPDT;     /* expiration date                         */
+	uint8_t  DS1NOEPV;           /* number of extents on volume             */
+        uint8_t  DS1NOBDB;           /* no. of bytes used in last direction blk */
+	uint8_t  DS1FLAG1;           /* flag 1                                  */
+	char  DS1SYSCD[13];       /* system code                             */
+	labeldate_t DS1REFD;      /* date last referenced                    */
+        uint8_t  DS1SMSFG;           /* system managed storage indicators       */
+        uint8_t  DS1SCXTF;           /* sec. space extension flag byte          */
+        uint16_t DS1SCXTV;           /* secondary space extension value         */
+        uint8_t  DS1DSRG1;           /* data set organisation byte 1            */
+        uint8_t  DS1DSRG2;           /* data set organisation byte 2            */
+  	uint8_t  DS1RECFM;           /* record format                           */
+	uint8_t  DS1OPTCD;           /* option code                             */
+	uint16_t DS1BLKL;            /* block length                            */
+	uint16_t DS1LRECL;           /* record length                           */
+	uint8_t  DS1KEYL;            /* key length                              */
+	uint16_t DS1RKP;             /* relative key position                   */
+	uint8_t  DS1DSIND;           /* data set indicators                     */
+        uint8_t  DS1SCAL1;           /* secondary allocation flag byte          */
+  	char DS1SCAL3[3];         /* secondary allocation quantity           */
+	ttr_t DS1LSTAR;           /* last used track and block on track      */
+	uint16_t DS1TRBAL;           /* space remaining on last used track      */
+        uint16_t res1;               /* reserved                                */
+	extent_t DS1EXT1;         /* first extent description                */
+	extent_t DS1EXT2;         /* second extent description               */
+	extent_t DS1EXT3;         /* third extent description                */
+	cchhb_t DS1PTRDS;         /* possible pointer to f2 or f3 DSCB       */
+} __attribute__ ((packed)) format1_label_t;
+
+
+/*
+ * struct dasd_information_t
+ * represents any data about the data, which is visible to userspace
+ */
+typedef struct dasd_information_t {
+	unsigned int devno;		/* S/390 devno */
+	unsigned int real_devno;	/* for aliases */
+	unsigned int schid;		/* S/390 subchannel identifier */
+	unsigned int cu_type  : 16;	/* from SenseID */
+	unsigned int cu_model :  8;	/* from SenseID */
+	unsigned int dev_type : 16;	/* from SenseID */
+	unsigned int dev_model : 8;	/* from SenseID */
+	unsigned int open_count;
+	unsigned int req_queue_len;
+	unsigned int chanq_len;		/* length of chanq */
+	char type[4];			/* from discipline.name, 'none' for unknown */
+	unsigned int status;		/* current device level */
+	unsigned int label_block;	/* where to find the VOLSER */
+	unsigned int FBA_layout;	/* fixed block size (like AIXVOL) */
+	unsigned int characteristics_size;
+	unsigned int confdata_size;
+	char characteristics[64];	/* from read_device_characteristics */
+	char configuration_data[256];	/* from read_configuration_data */
+} dasd_information_t;
+
+#define DASD_IOCTL_LETTER	 'D'
+#define BIODASDINFO _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
+#define BLKGETSIZE _IO(0x12,96)
+#define BLKSSZGET _IO(0x12,104)
+#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* device size in bytes (u64 *arg)*/
+
+/*
+ * Only compile this on S/390. Doesn't make any sense
+ * for other architectures.
+ */
+
+static unsigned char EBCtoASC[256] =
+{
+/* 0x00  NUL   SOH   STX   ETX  *SEL    HT  *RNL   DEL */
+	0x00, 0x01, 0x02, 0x03, 0x07, 0x09, 0x07, 0x7F,
+/* 0x08  -GE  -SPS  -RPT    VT    FF    CR    SO    SI */
+	0x07, 0x07, 0x07, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+/* 0x10  DLE   DC1   DC2   DC3  -RES   -NL    BS  -POC
+                                -ENP  ->LF             */
+	0x10, 0x11, 0x12, 0x13, 0x07, 0x0A, 0x08, 0x07,
+/* 0x18  CAN    EM  -UBS  -CU1  -IFS  -IGS  -IRS  -ITB
+                                                  -IUS */
+	0x18, 0x19, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+/* 0x20  -DS  -SOS    FS  -WUS  -BYP    LF   ETB   ESC
+                                -INP                   */
+	0x07, 0x07, 0x1C, 0x07, 0x07, 0x0A, 0x17, 0x1B,
+/* 0x28  -SA  -SFE   -SM  -CSP  -MFA   ENQ   ACK   BEL
+                     -SW                               */
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07,
+/* 0x30 ----  ----   SYN   -IR   -PP  -TRN  -NBS   EOT */
+	0x07, 0x07, 0x16, 0x07, 0x07, 0x07, 0x07, 0x04,
+/* 0x38 -SBS   -IT  -RFF  -CU3   DC4   NAK  ----   SUB */
+	0x07, 0x07, 0x07, 0x07, 0x14, 0x15, 0x07, 0x1A,
+/* 0x40   SP   RSP           ä              ----       */
+	0x20, 0xFF, 0x83, 0x84, 0x85, 0xA0, 0x07, 0x86,
+/* 0x48                      .     <     (     +     | */
+	0x87, 0xA4, 0x9B, 0x2E, 0x3C, 0x28, 0x2B, 0x7C,
+/* 0x50    &                                      ---- */
+	0x26, 0x82, 0x88, 0x89, 0x8A, 0xA1, 0x8C, 0x07,
+/* 0x58          ß     !     $     *     )     ;       */
+	0x8D, 0xE1, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0xAA,
+/* 0x60    -     /  ----     Ä  ----  ----  ----       */
+	0x2D, 0x2F, 0x07, 0x8E, 0x07, 0x07, 0x07, 0x8F,
+/* 0x68             ----     ,     %     _     >     ? */
+	0x80, 0xA5, 0x07, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,
+/* 0x70  ---        ----  ----  ----  ----  ----  ---- */
+	0x07, 0x90, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+/* 0x78    *     `     :     #     @     '     =     " */
+	0x70, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,
+/* 0x80    *     a     b     c     d     e     f     g */
+	0x07, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+/* 0x88    h     i              ----  ----  ----       */
+	0x68, 0x69, 0xAE, 0xAF, 0x07, 0x07, 0x07, 0xF1,
+/* 0x90    °     j     k     l     m     n     o     p */
+	0xF8, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70,
+/* 0x98    q     r                    ----        ---- */
+	0x71, 0x72, 0xA6, 0xA7, 0x91, 0x07, 0x92, 0x07,
+/* 0xA0          ~     s     t     u     v     w     x */
+	0xE6, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+/* 0xA8    y     z              ----  ----  ----  ---- */
+	0x79, 0x7A, 0xAD, 0xAB, 0x07, 0x07, 0x07, 0x07,
+/* 0xB0    ^                    ----     §  ----       */
+	0x5E, 0x9C, 0x9D, 0xFA, 0x07, 0x07, 0x07, 0xAC,
+/* 0xB8       ----     [     ]  ----  ----  ----  ---- */
+	0xAB, 0x07, 0x5B, 0x5D, 0x07, 0x07, 0x07, 0x07,
+/* 0xC0    {     A     B     C     D     E     F     G */
+	0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+/* 0xC8    H     I  ----           ö              ---- */
+	0x48, 0x49, 0x07, 0x93, 0x94, 0x95, 0xA2, 0x07,
+/* 0xD0    }     J     K     L     M     N     O     P */
+	0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,
+/* 0xD8    Q     R  ----           ü                   */
+	0x51, 0x52, 0x07, 0x96, 0x81, 0x97, 0xA3, 0x98,
+/* 0xE0    \           S     T     U     V     W     X */
+	0x5C, 0xF6, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+/* 0xE8    Y     Z        ----     Ö  ----  ----  ---- */
+	0x59, 0x5A, 0xFD, 0x07, 0x99, 0x07, 0x07, 0x07,
+/* 0xF0    0     1     2     3     4     5     6     7 */
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+/* 0xF8    8     9  ----  ----     Ü  ----  ----  ---- */
+	0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07
+};
+
+static inline void 
+vtoc_ebcdic_dec (const char *source, char *target, int l)
+{
+	int i;
+
+	for (i = 0; i < l; i++) 
+		target[i]=(char)EBCtoASC[(unsigned char)(source[i])];
+}
+
+/*
+ * compute the block number from a
+ * cyl-cyl-head-head structure
+ */
+static inline uint64_t
+cchh2blk (cchh_t *ptr, struct hd_geometry *geo)
+{
+	uint64_t cyl;
+	uint16_t head;
+
+	/*decode cylinder and heads for large volumes */
+	cyl = ptr->hh & 0xFFF0;
+	cyl <<= 12;
+	cyl |= ptr->cc;
+	head = ptr->hh & 0x000F;
+	return cyl * geo->heads * geo->sectors +
+	       head * geo->sectors;
+}
+
+/*
+ * compute the block number from a
+ * cyl-cyl-head-head-block structure
+ */
+static inline uint64_t
+cchhb2blk (cchhb_t *ptr, struct hd_geometry *geo)
+{
+	uint64_t cyl;
+	uint16_t head;
+
+	/*decode cylinder and heads for large volumes */
+	cyl = ptr->hh & 0xFFF0;
+	cyl <<= 12;
+	cyl |= ptr->cc;
+	head = ptr->hh & 0x000F;
+	return  cyl * geo->heads * geo->sectors +
+		head * geo->sectors +
+		ptr->b;
+}
+
+#endif /* _DASD_H */

=== added file 'kpartx/devmapper.c'
--- kpartx/devmapper.c	1970-01-01 00:00:00 +0000
+++ kpartx/devmapper.c	2011-01-04 21:28:57 +0000
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2004, 2005 Christophe Varoqui
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <libdevmapper.h>
+#include <ctype.h>
+#include <errno.h>
+#include "devmapper.h"
+
+#define UUID_PREFIX "part%d-"
+#define MAX_PREFIX_LEN 8
+
+extern int
+dm_prereq (char * str, int x, int y, int z)
+{
+	int r = 1;
+	struct dm_task *dmt;
+	struct dm_versions *target;
+	struct dm_versions *last_target;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_LIST_VERSIONS)))
+		return 1;
+
+	dm_task_no_open_count(dmt);
+
+	if (!dm_task_run(dmt))
+		goto out;
+
+	target = dm_task_get_versions(dmt);
+
+	/* Fetch targets and print 'em */
+	do {
+		last_target = target;
+
+		if (!strncmp(str, target->name, strlen(str)) &&
+		    /* dummy prereq on multipath version */
+		    target->version[0] >= x &&
+		    target->version[1] >= y &&
+		    target->version[2] >= z
+		   )
+			r = 0;
+
+		target = (void *) target + target->next;
+	} while (last_target != target);
+
+	out:
+	dm_task_destroy(dmt);
+	return r;
+}
+
+extern int
+dm_simplecmd (int task, const char *name, int no_flush, uint32_t *cookie) {
+	int r = 0;
+	int udev_wait_flag = (task == DM_DEVICE_RESUME ||
+			      task == DM_DEVICE_REMOVE);
+	struct dm_task *dmt;
+
+	if (!(dmt = dm_task_create(task)))
+		return 0;
+
+	if (!dm_task_set_name(dmt, name))
+		goto out;
+
+	dm_task_no_open_count(dmt);
+	dm_task_skip_lockfs(dmt);
+
+	if (no_flush)
+		dm_task_no_flush(dmt);
+
+	if (udev_wait_flag && !dm_task_set_cookie(dmt, cookie, 0))
+		goto out;
+	r = dm_task_run(dmt);
+
+	out:
+	dm_task_destroy(dmt);
+	return r;
+}
+
+extern int
+dm_addmap (int task, const char *name, const char *target,
+	   const char *params, uint64_t size, const char *uuid, int part,
+	   mode_t mode, uid_t uid, gid_t gid, uint32_t *cookie) {
+	int r = 0;
+	struct dm_task *dmt;
+	char *prefixed_uuid = NULL;
+
+	if (!(dmt = dm_task_create (task)))
+		return 0;
+
+	if (!dm_task_set_name (dmt, name))
+		goto addout;
+
+	if (!dm_task_add_target (dmt, 0, size, target, params))
+		goto addout;
+
+	if (task == DM_DEVICE_CREATE && uuid) {
+		prefixed_uuid = malloc(MAX_PREFIX_LEN + strlen(uuid) + 1);
+		if (!prefixed_uuid) {
+			fprintf(stderr, "cannot create prefixed uuid : %s\n",
+				strerror(errno));
+			goto addout;
+		}
+		sprintf(prefixed_uuid, UUID_PREFIX "%s", part, uuid);
+		if (!dm_task_set_uuid(dmt, prefixed_uuid))
+			goto addout;
+	}
+
+	if (!dm_task_set_mode(dmt, mode))
+		goto addout;
+	if (!dm_task_set_uid(dmt, uid))
+		goto addout;
+	if (!dm_task_set_gid(dmt, gid))
+		goto addout;
+
+	dm_task_no_open_count(dmt);
+
+	if (task == DM_DEVICE_CREATE && !dm_task_set_cookie(dmt, cookie, 0))
+		goto addout;
+	r = dm_task_run (dmt);
+
+	addout:
+	dm_task_destroy (dmt);
+
+	return r;
+}
+
+extern int
+dm_map_present (char * str)
+{
+	int r = 0;
+	struct dm_task *dmt;
+	struct dm_info info;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
+		return 0;
+
+	if (!dm_task_set_name(dmt, str))
+		goto out;
+
+	dm_task_no_open_count(dmt);
+
+	if (!dm_task_run(dmt))
+		goto out;
+
+	if (!dm_task_get_info(dmt, &info))
+		goto out;
+
+	if (info.exists)
+		r = 1;
+out:
+	dm_task_destroy(dmt);
+	return r;
+}
+
+
+char *
+dm_mapname(int major, int minor)
+{
+	struct dm_task *dmt;
+	char *mapname = NULL;
+	const char *map;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
+		return NULL;
+
+	dm_task_no_open_count(dmt);
+	dm_task_set_major(dmt, major);
+	dm_task_set_minor(dmt, minor);
+
+	if (!dm_task_run(dmt))
+		goto out;
+
+	map = dm_task_get_name(dmt);
+	if (map && strlen(map))
+		mapname = strdup(map);
+
+out:
+	dm_task_destroy(dmt);
+	return mapname;
+}
+
+/*
+ * dm_get_first_dep
+ *
+ * Return the device number of the first dependend device
+ * for a given target.
+ */
+dev_t dm_get_first_dep(char *devname)
+{
+	struct dm_task *dmt;
+	struct dm_deps *dm_deps;
+	dev_t ret = 0;
+
+	if ((dmt = dm_task_create(DM_DEVICE_DEPS)) == NULL) {
+		return ret;
+	}
+	if (!dm_task_set_name(dmt, devname)) {
+		goto out;
+	}
+	if (!dm_task_run(dmt)) {
+		goto out;
+	}
+	if ((dm_deps = dm_task_get_deps(dmt)) == NULL) {
+		goto out;
+	}
+	if (dm_deps->count > 0) {
+		ret = dm_deps->device[0];
+	}
+out:
+	dm_task_destroy(dmt);
+
+	return ret;
+}
+
+char *
+dm_mapuuid(int major, int minor)
+{
+	struct dm_task *dmt;
+	const char *tmp;
+	char *uuid = NULL;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
+		return NULL;
+
+	dm_task_no_open_count(dmt);
+	dm_task_set_major(dmt, major);
+	dm_task_set_minor(dmt, minor);
+
+	if (!dm_task_run(dmt))
+		goto out;
+
+	tmp = dm_task_get_uuid(dmt);
+	if (tmp[0] != '\0')
+		uuid = strdup(tmp);
+out:
+	dm_task_destroy(dmt);
+	return uuid;
+}
+
+int
+dm_devn (char * mapname, int *major, int *minor)
+{
+	int r = 1;
+	struct dm_task *dmt;
+	struct dm_info info;
+
+	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
+		return 0;
+
+	if (!dm_task_set_name(dmt, mapname))
+		goto out;
+
+	if (!dm_task_run(dmt))
+		goto out;
+
+	if (!dm_task_get_info(dmt, &info))
+		goto out;
+
+	*major = info.major;
+	*minor = info.minor;
+
+	r = 0;
+out:
+	dm_task_destroy(dmt);
+	return r;
+}
+

=== added file 'kpartx/devmapper.h'
--- kpartx/devmapper.h	1970-01-01 00:00:00 +0000
+++ kpartx/devmapper.h	2011-01-04 21:28:57 +0000
@@ -0,0 +1,13 @@
+#define MAJOR(dev)      ((dev & 0xfff00) >> 8)
+#define MINOR(dev)      ((dev & 0xff) | ((dev >> 12) & 0xfff00))
+#define MKDEV(ma,mi)    ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+
+int dm_prereq (char *, int, int, int);
+int dm_simplecmd (int, const char *, int, uint32_t *);
+int dm_addmap (int, const char *, const char *, const char *, uint64_t,
+	       const char *, int, mode_t, uid_t, gid_t, uint32_t *);
+int dm_map_present (char *);
+char * dm_mapname(int major, int minor);
+dev_t dm_get_first_dep(char *devname);
+char * dm_mapuuid(int major, int minor);
+int dm_devn (char * mapname, int *major, int *minor);

=== added file 'kpartx/dos.c'
--- kpartx/dos.c	1970-01-01 00:00:00 +0000
+++ kpartx/dos.c	2011-01-04 21:28:57 +0000
@@ -0,0 +1,105 @@
+/*
+ * Source: copy of util-linux' partx dos.c
+ *
+ * Copyrights of the original file apply 
+ * Copyright (c) 2005 Bastian Blank
+ */
+#include "kpartx.h"
+#include "byteorder.h"
+#include <stdio.h>
+#include <string.h>
+#include "dos.h"
+
+static int
+is_extended(int type) {
+	return (type == 5 || type == 0xf || type == 0x85);
+}
+
+static int
+read_extended_partition(int fd, struct partition *ep, int en,
+			struct slice *sp, int ns)
+{
+	struct partition p;
+	unsigned long start, here, next;
+	unsigned char *bp;
+	int loopct = 0;
+	int moretodo = 1;
+	int i, n=0;
+
+	next = start = le32_to_cpu(ep->start_sect);
+
+	while (moretodo) {
+		here = next;
+		moretodo = 0;
+		if (++loopct > 100)
+			return n;
+
+		bp = (unsigned char *)getblock(fd, here);
+		if (bp == NULL)
+			return n;
+
+		if (bp[510] != 0x55 || bp[511] != 0xaa)
+			return n;
+
+		for (i=0; i<2; i++) {
+			memcpy(&p, bp + 0x1be + i * sizeof (p), sizeof (p));
+			if (is_extended(p.sys_type)) {
+				if (p.nr_sects && !moretodo) {
+					next = start + le32_to_cpu(p.start_sect);
+					moretodo = 1;
+				}
+				continue;
+			}
+			if (n < ns) {
+				sp[n].start = here + le32_to_cpu(p.start_sect);
+				sp[n].size = le32_to_cpu(p.nr_sects);
+				sp[n].container = en + 1;
+				n++;
+			} else {
+				fprintf(stderr,
+				    "dos_extd_partition: too many slices\n");
+				return n;
+			}
+			loopct = 0;
+		}
+	}
+	return n;
+}
+
+static int
+is_gpt(int type) {
+	return (type == 0xEE);
+}
+
+int
+read_dos_pt(int fd, struct slice all, struct slice *sp, int ns) {
+	struct partition p;
+	unsigned long offset = all.start;
+	int i, n=4;
+	unsigned char *bp;
+
+	bp = (unsigned char *)getblock(fd, offset);
+	if (bp == NULL)
+		return -1;
+
+	if (bp[510] != 0x55 || bp[511] != 0xaa)
+		return -1;
+
+	for (i=0; i<4; i++) {
+		memcpy(&p, bp + 0x1be + i * sizeof (p), sizeof (p));
+		if (is_gpt(p.sys_type))
+			return 0;
+		if (i < ns) {
+			sp[i].start =  le32_to_cpu(p.start_sect);
+			sp[i].size = le32_to_cpu(p.nr_sects);
+		} else {
+			fprintf(stderr,
+				"dos_partition: too many slices\n");
+			break;
+		}
+		if (is_extended(p.sys_type)) {
+			n += read_extended_partition(fd, &p, i, sp+n, ns-n);
+		}
+	}
+	return n;
+}

=== added file 'kpartx/dos.h'
--- kpartx/dos.h	1970-01-01 00:00:00 +0000
+++ kpartx/dos.h	2011-01-04 21:28:57 +0000
@@ -0,0 +1,13 @@
+#ifndef DOS_H_INCLUDED
+#define DOS_H_INCLUDED
+
+struct partition {
+	unsigned char boot_ind;	/* 0x80 - active */
+	unsigned char bh, bs, bc;
+	unsigned char sys_type;
+	unsigned char eh, es, ec;
+	unsigned int start_sect;
+	unsigned int nr_sects;
+} __attribute__((packed));
+
+#endif				/* DOS_H_INCLUDED */

=== added file 'kpartx/efi.h'
--- kpartx/efi.h	1970-01-01 00:00:00 +0000
+++ kpartx/efi.h	2011-01-04 21:28:57 +0000
@@ -0,0 +1,58 @@
+/*
+  efi.[ch] - Manipulates EFI variables as exported in /proc/efi/vars
+ 
+  Copyright (C) 2001 Dell Computer Corporation <[e-mail]>
+ 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef EFI_H
+#define EFI_H
+
+/*
+ * Extensible Firmware Interface
+ * Based on 'Extensible Firmware Interface Specification'
+ *      version 1.02, 12 December, 2000
+ */
+#include <stdint.h>
+#include <string.h>
+
+typedef struct {
+	uint8_t  b[16];
+} efi_guid_t;
+
+#define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
+((efi_guid_t) \
+{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
+  (b) & 0xff, ((b) >> 8) & 0xff, \
+  (c) & 0xff, ((c) >> 8) & 0xff, \
+  (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
+
+
+/******************************************************
+ * GUIDs
+ ******************************************************/
+#define NULL_GUID \
+EFI_GUID( 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+
+static inline int
+efi_guidcmp(efi_guid_t left, efi_guid_t right)
+{
+	return memcmp(&left, &right, sizeof (efi_guid_t));
+}
+
+typedef uint16_t efi_char16_t;		/* UNICODE character */
+
+#endif /* EFI_H */

=== added file 'kpartx/gpt.c'
--- kpartx/gpt.c	1970-01-01 00:00:00 +0000
+++ kpartx/gpt.c	2011-01-04 21:28:57 +0000
@@ -0,0 +1,647 @@
+/*
+    gpt.[ch]
+
+    Copyright (C) 2000-2001 Dell Computer Corporation <[e-mail]> 
+
+    EFI GUID Partition Table handling
+    Per Intel EFI Specification v1.02
+    http://developer.intel.com/technology/efi/efi.htm
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#define _FILE_OFFSET_BITS 64
+
+#include "gpt.h"
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
+#include <endian.h>
+#include <byteswap.h>
+#include <linux/fs.h>
+#include "crc32.h"
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+#  define __le16_to_cpu(x) (x)
+#  define __le32_to_cpu(x) (x)
+#  define __le64_to_cpu(x) (x)
+#  define __cpu_to_le32(x) (x)
+#elif BYTE_ORDER == BIG_ENDIAN
+#  define __le16_to_cpu(x) bswap_16(x)
+#  define __le32_to_cpu(x) bswap_32(x)
+#  define __le64_to_cpu(x) bswap_64(x)
+#  define __cpu_to_le32(x) bswap_32(x)
+#endif
+
+#ifndef BLKGETLASTSECT
+#define BLKGETLASTSECT  _IO(0x12,108)   /* get last sector of block device */
+#endif
+#ifndef BLKGETSIZE
+#define BLKGETSIZE _IO(0x12,96)	        /* return device size */
+#endif
+#ifndef BLKSSZGET
+#define BLKSSZGET  _IO(0x12,104)	/* get block device sector size */
+#endif
+#ifndef BLKGETSIZE64
+#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t))	/* return device size in bytes (u64 *arg) */
+#endif
+
+struct blkdev_ioctl_param {
+        unsigned int block;
+        size_t content_length;
+        char * block_contents;
+};
+
+/**
+ * efi_crc32() - EFI version of crc32 function
+ * @buf: buffer to calculate crc32 of
+ * @len - length of buf
+ *
+ * Description: Returns EFI-style CRC32 value for @buf
+ * 
+ * This function uses the little endian Ethernet polynomial
+ * but seeds the function with ~0, and xor's with ~0 at the end.
+ * Note, the EFI Specification, v1.02, has a reference to
+ * Dr. Dobbs Journal, May 1994 (actually it's in May 1992).
+ */
+static inline uint32_t
+efi_crc32(const void *buf, unsigned long len)
+{
+	return (crc32(~0L, buf, len) ^ ~0L);
+}
+
+/**
+ * is_pmbr_valid(): test Protective MBR for validity
+ * @mbr: pointer to a legacy mbr structure
+ *
+ * Description: Returns 1 if PMBR is valid, 0 otherwise.
+ * Validity depends on two things:
+ *  1) MSDOS signature is in the last two bytes of the MBR
+ *  2) One partition of type 0xEE is found
+ */
+static int
+is_pmbr_valid(legacy_mbr *mbr)
+{
+	int i, found = 0, signature = 0;
+	if (!mbr)
+		return 0;
+	signature = (__le16_to_cpu(mbr->signature) == MSDOS_MBR_SIGNATURE);
+	for (i = 0; signature && i < 4; i++) {
+		if (mbr->partition[i].sys_type ==
+                    EFI_PMBR_OSTYPE_EFI_GPT) {
+			found = 1;
+			break;
+		}
+	}
+	return (signature && found);
+}
+
+
+/************************************************************
+ * get_sector_size
+ * Requires:
+ *  - filedes is an open file descriptor, suitable for reading
+ * Modifies: nothing
+ * Returns:
+ *  sector size, or 512.
+ ************************************************************/
+static int
+get_sector_size(int filedes)
+{
+	int rc, sector_size = 512;
+
+	rc = ioctl(filedes, BLKSSZGET, &sector_size);
+	if (rc)
+		sector_size = 512;
+	return sector_size;
+}
+
+/************************************************************
+ * _get_num_sectors
+ * Requires:
+ *  - filedes is an open file descriptor, suitable for reading
+ * Modifies: nothing
+ * Returns:
+ *  Last LBA value on success 
+ *  0 on error
+ *
+ * Try getting BLKGETSIZE64 and BLKSSZGET first,
+ * then BLKGETSIZE if necessary.
+ *  Kernels 2.4.15-2.4.18 and 2.5.0-2.5.3 have a broken BLKGETSIZE64
+ *  which returns the number of 512-byte sectors, not the size of
+ *  the disk in bytes. Fixed in kernels 2.4.18-pre8 and 2.5.4-pre3.
+ ************************************************************/
+static uint64_t
+_get_num_sectors(int filedes)
+{
+	int rc;
+	uint64_t bytes=0;
+
+	rc = ioctl(filedes, BLKGETSIZE64, &bytes);
+	if (!rc)
+		return bytes / get_sector_size(filedes);
+
+	return 0;
+}
+
+/************************************************************
+ * last_lba(): return number of last logical block of device
+ * 
+ * @fd
+ * 
+ * Description: returns Last LBA value on success, 0 on error.
+ * Notes: The value st_blocks gives the size of the file
+ *        in 512-byte blocks, which is OK if
+ *        EFI_BLOCK_SIZE_SHIFT == 9.
+ ************************************************************/
+
+static uint64_t
+last_lba(int filedes)
+{
+	int rc;
+	uint64_t sectors = 0;
+	struct stat s;
+	memset(&s, 0, sizeof (s));
+	rc = fstat(filedes, &s);
+	if (rc == -1) {
+		fprintf(stderr, "last_lba() could not stat: %s\n",
+			strerror(errno));
+		return 0;
+	}
+
+	if (S_ISBLK(s.st_mode)) {
+		sectors = _get_num_sectors(filedes);
+	} else {
+		fprintf(stderr,
+			"last_lba(): I don't know how to handle files with mode %x\n",
+			s.st_mode);
+		sectors = 1;
+	}
+
+	return sectors ? sectors - 1 : 0;
+}
+
+
+static ssize_t
+read_lastoddsector(int fd, uint64_t lba, void *buffer, size_t count)
+{
+        int rc;
+        struct blkdev_ioctl_param ioctl_param;
+
+        if (!buffer) return 0; 
+
+        ioctl_param.block = 0; /* read the last sector */
+        ioctl_param.content_length = count;
+        ioctl_param.block_contents = buffer;
+
+        rc = ioctl(fd, BLKGETLASTSECT, &ioctl_param);
+        if (rc == -1) perror("read failed");
+
+        return !rc;
+}
+
+static ssize_t
+read_lba(int fd, uint64_t lba, void *buffer, size_t bytes)
+{
+	int sector_size = get_sector_size(fd);
+	off_t offset = lba * sector_size;
+	uint64_t lastlba;
+        ssize_t bytesread;
+
+	lseek(fd, offset, SEEK_SET);
+	bytesread = read(fd, buffer, bytes);
+
+	lastlba = last_lba(fd);
+	if (!lastlba)
+		return bytesread;
+
+        /* Kludge.  This is necessary to read/write the last
+           block of an odd-sized disk, until Linux 2.5.x kernel fixes.
+           This is only used by gpt.c, and only to read
+           one sector, so we don't have to be fancy.
+        */
+        if (!bytesread && !(lastlba & 1) && lba == lastlba) {
+                bytesread = read_lastoddsector(fd, lba, buffer, bytes);