diff options
| author | Milan Broz <mbroz@redhat.com> | 2011-08-11 17:06:24 +0000 |
|---|---|---|
| committer | Milan Broz <mbroz@redhat.com> | 2011-08-11 17:06:24 +0000 |
| commit | 2836eabc9e20e40f395543a6f4eb354e90f373cd (patch) | |
| tree | d3d8c9dd655adc4adb4bc17f8550d38f30480786 | |
| parent | 47d7f00e167d54db23feb8b2ec27d08a19308cef (diff) | |
| download | lvm2-2836eabc9e20e40f395543a6f4eb354e90f373cd.tar.gz lvm2-2836eabc9e20e40f395543a6f4eb354e90f373cd.tar.xz lvm2-2836eabc9e20e40f395543a6f4eb354e90f373cd.zip | |
Remove dev name prefix from dmsetup line output if major and minor is used.
| -rw-r--r-- | WHATS_NEW_DM | 1 | ||||
| -rw-r--r-- | tools/dmsetup.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d748fc5b..d01e346f 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.66 - =============================== + Remove dev name prefix from dmsetup line output if major and minor is used. Remove support for the original version 1 dm ioctls. Add missing check for allocation failure _create_dir_recursive(). Add support for systemd file descriptor handover in dmeventd. diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 8a61b1f1..f1911d47 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -3478,7 +3478,8 @@ int main(int argc, char **argv) #endif doit: - multiple_devices = (argc != 2 && cmd->repeatable_cmd); + multiple_devices = (cmd->repeatable_cmd && argc != 2 && + (argc != 1 || (!_switches[UUID_ARG] && !_switches[MAJOR_ARG]))); do { if (!cmd->fn(cmd, argc--, argv++, NULL, multiple_devices)) { fprintf(stderr, "Command failed\n"); |