X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=device-mapper-dmsetup-export.patch;h=53c3ba7bc4b390f457b6987f12b4b97d23cca944;hb=f0ac180b462502deec6bf03e480574a9be3750d0;hp=d390bda5a9777fbb9e3d4ca62cfff7c5fb06eb10;hpb=97deeeaf76dc399c5dd3ae7eaae2621b3533c6e0;p=packages%2Flvm2.git

diff --git a/device-mapper-dmsetup-export.patch b/device-mapper-dmsetup-export.patch
index d390bda..53c3ba7 100644
--- a/device-mapper-dmsetup-export.patch
+++ b/device-mapper-dmsetup-export.patch
@@ -7,34 +7,38 @@ Index: LVM2.2.02.98/man/dmsetup.8.in
 ===================================================================
 --- LVM2.2.02.116.orig/man/dmsetup.8.in	2015-01-30 16:19:53.000000000 +0000
 +++ LVM2.2.02.116/man/dmsetup.8.in	2015-02-03 21:05:01.635601115 +0000
-@@ -19,6 +19,9 @@ dmsetup \(em low level logical volume ma
- .RI [ + ]< sectors >| auto | none ]
- .RE
- .br
-+.B dmsetup export
-+.I [ device_name ]
-+.br
- .B dmsetup deps
- .RB [ \-o
- .IR options ]
-@@ -309,6 +312,10 @@ device_name in subsequent dmsetup comman
- If successful a device will appear as
- /dev/mapper/<device-name>.
- See below for information on the table format.
-+.IP \fBexport
-+.I [ device_name ]
+@@ -48,6 +48,14 @@ dmsetup \(em low level logical volume ma
+ .
+ .HP
+ .B dmsetup
++.de CMD_EXPORT
++.  BR export
++.  RI [ device_name ]
++..
++.CMD_EXPORT
++.
++.HP
++.B dmsetup
+ .de CMD_HELP
+ .  BR help
+ .  RB [ \-c | \-C | \-\-columns ]
+@@ -629,6 +637,11 @@ device. Device names on output can be cu
+ \fBdevname\fP (map name for device-mapper devices, equal to blkdevname otherwise).
+ .
+ .HP
++.CMD_EXPORT
 +.br
 +Outputs information in key/value format to be imported by other programs.
++.
++.HP
+ .CMD_HELP
  .br
- .TP
- .B deps
+ Outputs a summary of the commands available, optionally including
 Index: LVM2.2.02.98/tools/dmsetup.c
 ===================================================================
 --- LVM2.2.02.98.orig/tools/dmsetup.c
 +++ LVM2.2.02.98/tools/dmsetup.c
-@@ -1706,10 +1706,97 @@ static int _status(CMD_ARGS)
-       out:
- 	dm_task_destroy(dmt);
+@@ -2194,6 +2194,93 @@ out:
  	return r;
  }
  
@@ -128,17 +132,11 @@ Index: LVM2.2.02.98/tools/dmsetup.c
  /* Show target names and their version numbers */
  static int _targets(CMD_ARGS)
  {
- 	int r = 0;
- 	struct dm_task *dmt;
-@@ -3056,10 +3143,11 @@ static struct command _commands[] = {
- 	{"message", "<device> <sector> <message>", 2, -1, 0, _message},
- 	{"ls", "[--target <target_type>] [--exec <command>] [-o options] [--tree]", 0, 0, 0, _ls},
- 	{"info", "[<device>]", 0, -1, 1, _info},
- 	{"deps", "[-o options] [<device>]", 0, -1, 1, _deps},
- 	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, _status},
-+	{"export", "[<device>]", 0, 1, 1, _export},
- 	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, _status},
- 	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, _wait},
- 	{"mknodes", "[<device>]", 0, -1, 1, _mknodes},
- 	{"mangle", "[<device>]", 0, -1, 1, _mangle},
- 	{"udevcreatecookie", "", 0, 0, 0, _udevcreatecookie},
+@@ -5155,6 +5242,7 @@ static struct command _dmsetup_commands[
+ 	{"deps", "[-o <options>] [<device>]", 0, -1, 1, 0, _deps},
+ 	{"stats", "<command> [<options>] [<devices>]", 1, -1, 1, 1, _stats},
+ 	{"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, 0, _status},
++	{"export", "[<device>]", 0, 1, 1, 0, _export},
+ 	{"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, 0, _status},
+ 	{"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, 0, _wait},
+ 	{"mknodes", "[<device>]", 0, -1, 1, 0, _mknodes},