SHA256
1
0
forked from pool/lvm2

Accepting request 140942 from home:seife:branches:Base:System

fix bnc#789019,bnc#789020,bnc#789021

OBS-URL: https://build.opensuse.org/request/show/140942
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=51
This commit is contained in:
Stefan Seyfried
2012-11-12 12:23:48 +00:00
committed by Git OBS Bridge
parent 97b3689a1e
commit b693392ea6
4 changed files with 64 additions and 17 deletions

View File

@@ -1,11 +1,15 @@
---
man/dmsetup.8.in | 7 ++++
tools/dmsetup.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+)
tools/dmsetup.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 95 insertions(+)
Index: LVM2.2.02.98/man/dmsetup.8.in
===================================================================
--- LVM2.2.02.98.orig/man/dmsetup.8.in
+++ LVM2.2.02.98/man/dmsetup.8.in
@@ -19,6 +19,9 @@ dmsetup \- low level logical volume mana
@@ -17,10 +17,13 @@ dmsetup \- low level logical volume mana
.RB [{ \-\-addnodeoncreate | \-\-addnodeonresume }]
.RB [ \-\-readahead
.RI [ \+ ]< sectors >| auto | none ]
.RE
.br
@@ -15,7 +19,11 @@
.B dmsetup deps
.RB [ \-o
.IR options ]
@@ -285,6 +288,10 @@ device_name in subsequent dmsetup comman
.RI [ device_name ]
.br
@@ -283,10 +286,14 @@ Otherwise a table is read from standard
The optional uuid can be used in place of
device_name in subsequent dmsetup commands.
If successful a device will appear as
/dev/mapper/<device-name>.
See below for information on the table format.
@@ -26,13 +34,19 @@
.br
.TP
.B deps
.RB [ \-o
.IR options ]
Index: LVM2.2.02.98/tools/dmsetup.c
===================================================================
--- LVM2.2.02.98.orig/tools/dmsetup.c
+++ LVM2.2.02.98/tools/dmsetup.c
@@ -1708,6 +1708,94 @@ static int _status(CMD_ARGS)
@@ -1706,10 +1706,97 @@ static int _status(CMD_ARGS)
out:
dm_task_destroy(dmt);
return r;
}
+static int _export(int argc, char **argv, void *data)
+static int _export(CMD_ARGS)
+{
+ int r = 0;
+ struct dm_task *dmt = NULL;
@@ -40,12 +54,11 @@
+ uint64_t start, length;
+ char *target_type = NULL;
+ char *params;
+ struct dm_names *names = (struct dm_names *) data;
+ const char *name = NULL;
+ const char *uuid = NULL;
+ struct dm_info info;
+
+ if (data)
+ if (names)
+ name = names->name;
+ else if (argc == 2)
+ name = argv[1];
@@ -123,7 +136,11 @@
/* Show target names and their version numbers */
static int _targets(CMD_ARGS)
{
@@ -3058,6 +3146,7 @@ static struct command _commands[] = {
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},
@@ -131,3 +148,5 @@
{"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},