From 1779aee72cc37dcbb157994a129ef9a84cc2457a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Mon, 12 Feb 2018 09:15:55 +0100
Subject: [PATCH] dm:dm-shutdown.sh: silence all disassembly until the last try

---
 modules.d/90dm/dm-shutdown.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules.d/90dm/dm-shutdown.sh b/modules.d/90dm/dm-shutdown.sh
index b23836f4..b51df2de 100755
--- a/modules.d/90dm/dm-shutdown.sh
+++ b/modules.d/90dm/dm-shutdown.sh
@@ -32,7 +32,11 @@ _do_dm_shutdown() {
     info "Disassembling device-mapper devices"
     for dev in /sys/block/dm-* ; do
         [ -e ${dev} ] || continue
-        _remove_dm ${dev##*/} || ret=$?
+        if [ "x$final" != "x" ]; then
+            _remove_dm ${dev##*/} || ret=$?
+        else
+            _remove_dm ${dev##*/} >/dev/null 2>&1 || ret=$?
+        fi
     done
     if [ "x$final" != "x" ]; then
         info "dmsetup ls --tree"