From 2836eabc9e20e40f395543a6f4eb354e90f373cd Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 11 Aug 2011 17:06:24 +0000 Subject: [PATCH] Remove dev name prefix from dmsetup line output if major and minor is used. --- WHATS_NEW_DM | 1 + tools/dmsetup.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d748fc5b8..d01e346fb 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 8a61b1f14..f1911d473 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"); -- 2.43.5