Merge lp:~jamesodhunt/ubuntu/utopic/multipath-tools/document-sync-option into lp:ubuntu/utopic/multipath-tools

[James Hunt]

* debian/patches/0011-kpartx-options-manpage.patch: Document '-s' option.

[lp:~jamesodhunt/ubuntu/utopic/multipath-tools/document-sync-option]

51. By Rafael David Tinoco on 2014-09-02

* Added 0011-libmultipath-update-waiter-handling.patch (LP: #1354114)
* Added 0012-Race-condition-when-calling-stop_waiter_thread.patch (LP: #1354114)
* Added 0013-multipath-clean-up-code-for-stopping-the-waiter-thre.patch (LP: #1354114)
* Added 0014-Fix-race-condition-in-stop_waiter_thread.patch (LP: #1354114)

[Marc Deslauriers (mdeslaur)]

This doesn't look right. I don't see the actual patch in the commit. Perhaps forgot to bzr add it?

review: Needs Fixing

[lp:~jamesodhunt/ubuntu/utopic/multipath-tools/document-sync-option]

52. By James Hunt on 2014-09-29

debian/patches/0011-kpartx-options-manpage.patch: document '-s' option.

[James Hunt (jamesodhunt)]

Thanks Marc - branch updated.

Unmerged revisions

52. By James Hunt on 2014-09-29

debian/patches/0011-kpartx-options-manpage.patch: document '-s' option.

=== added directory '.pc/0015-kpartx-options-manpage.patch'
=== added file '.pc/0015-kpartx-options-manpage.patch/.timestamp'
=== added directory '.pc/0015-kpartx-options-manpage.patch/kpartx'
=== added file '.pc/0015-kpartx-options-manpage.patch/kpartx/kpartx.8'
--- .pc/0015-kpartx-options-manpage.patch/kpartx/kpartx.8	1970-01-01 00:00:00 +0000
+++ .pc/0015-kpartx-options-manpage.patch/kpartx/kpartx.8	2014-09-29 10:17:02 +0000
@@ -0,0 +1,65 @@
+.TH KPARTX 8 "July 2006" "" "Linux Administrator's Manual"
+.SH NAME
+kpartx \- Create device maps from partition tables
+.SH SYNOPSIS
+.B kpartx
+.RB [\| \-a\ \c
+.BR |\ -d\ |\ -l \|]
+.RB [\| \-v \|]
+.RB wholedisk
+.SH DESCRIPTION
+This tool, derived from util-linux' partx, reads partition
+tables on specified device and create device maps over partitions 
+segments detected. It is called from hotplug upon device maps 
+creation and deletion.
+.SH OPTIONS
+.TP
+.B \-a
+Add partition mappings
+.TP
+.B \-r
+Read-only partition mappings
+.TP
+.B \-d
+Delete partition mappings
+.TP
+.B \-l
+List partition mappings that would be added \-a
+.TP
+.B \-p
+set device name-partition number delimiter
+.TP
+.B \-g
+force GUID partition table (GPT)
+.TP
+.B \-v
+Operate verbosely
+.SH EXAMPLE
+To mount all the partitions in a raw disk image:
+.IP
+kpartx -av disk.img
+.PP
+This will output lines such as:
+.IP
+loop3p1 : 0 20964762 /dev/loop3 63
+.PP
+The 
+.I loop3p1
+is the name of a device file under 
+.I /dev/mapper
+which you can use to access the partition, for example to fsck it:
+.IP
+fsck /dev/mapper/loop3p1
+.PP
+When you're done, you need to remove the devices:
+.IP
+kpartx -d disk.img
+.SH "SEE ALSO"
+.BR multipath (8)
+.BR multipathd (8)
+.BR hotplug (8)
+.SH "AUTHORS"
+This man page was assembled By Patrick Caulfield
+for the Debian project. From documentation provided
+by the multipath author Christophe Varoqui, <[e-mail]> and others.
+

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-09-02 15:43:38 +0000
+++ .pc/applied-patches	2014-09-29 10:17:02 +0000
@@ -14,3 +14,4 @@
 0012-Race-condition-when-calling-stop_waiter_thread.patch
 0013-multipath-clean-up-code-for-stopping-the-waiter-thre.patch
 0014-Fix-race-condition-in-stop_waiter_thread.patch
+0015-kpartx-options-manpage.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-02 15:43:38 +0000
+++ debian/changelog	2014-09-29 10:17:02 +0000
@@ -1,3 +1,9 @@
+multipath-tools (0.4.9-3ubuntu10) UNRELEASED; urgency=medium
+
+  * debian/patches/0011-kpartx-options-manpage.patch: document '-s' option.
+
+ -- James Hunt <[e-mail]>  Mon, 29 Sep 2014 11:15:46 +0100
+
 multipath-tools (0.4.9-3ubuntu9) utopic; urgency=medium
 
   * Added 0011-libmultipath-update-waiter-handling.patch (LP: #1354114)

=== added file 'debian/patches/0015-kpartx-options-manpage.patch'
--- debian/patches/0015-kpartx-options-manpage.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0015-kpartx-options-manpage.patch	2014-09-29 10:17:02 +0000
@@ -0,0 +1,30 @@
+Description: Add missing '-s' option and warn about running asynchronously.
+Author: James Hunt <[e-mail]>
+Last-Update: 2014-08-13
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/kpartx/kpartx.8
++++ b/kpartx/kpartx.8
+@@ -15,7 +15,10 @@
+ .SH OPTIONS
+ .TP
+ .B \-a
+-Add partition mappings
++Add partition mappings, asynchronously by default.
++
++Note that unless \fB\-s\fR is also specified, mappings may not be fully
++available when kpartx exits\fR.
+ .TP
+ .B \-r
+ Read-only partition mappings
+@@ -32,6 +35,10 @@
+ .B \-g
+ force GUID partition table (GPT)
+ .TP
++.B \-s
++Operate synchronously - block until the operation has completed. Only
++meaningful when used with \fB\-a\fR.
++.TP
+ .B \-v
+ Operate verbosely
+ .SH EXAMPLE

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-09-02 15:43:38 +0000
+++ debian/patches/series	2014-09-29 10:17:02 +0000
@@ -14,3 +14,4 @@
 0012-Race-condition-when-calling-stop_waiter_thread.patch
 0013-multipath-clean-up-code-for-stopping-the-waiter-thre.patch
 0014-Fix-race-condition-in-stop_waiter_thread.patch
+0015-kpartx-options-manpage.patch

=== modified file 'kpartx/kpartx.8'
--- kpartx/kpartx.8	2011-12-04 21:32:48 +0000
+++ kpartx/kpartx.8	2014-09-29 10:17:02 +0000
@@ -15,7 +15,10 @@
 .SH OPTIONS
 .TP
 .B \-a
-Add partition mappings
+Add partition mappings, asynchronously by default.
+
+Note that unless \fB\-s\fR is also specified, mappings may not be fully
+available when kpartx exits\fR.
 .TP
 .B \-r
 Read-only partition mappings
@@ -32,6 +35,10 @@
 .B \-g
 force GUID partition table (GPT)
 .TP
+.B \-s
+Operate synchronously - block until the operation has completed. Only
+meaningful when used with \fB\-a\fR.
+.TP
 .B \-v
 Operate verbosely
 .SH EXAMPLE