Remove dev name prefix from dmsetup line output if major and minor is used.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index d748fc5b802c223e02767678afa4dc48b0602678..d01e346fbc14cb1db04451406234576a198faffe 100644 (file)
--- 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 8a61b1f1417fcd007d5b66cf3cdc6f10224bb484..f1911d4732fe1a5a76a1329aea93ec775ffad7d7 100644 (file)
--- 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");