From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 27 Oct 2015 14:13:27 +0000 (-0400)
Subject: krbd: remove deprecated --quiet param from udevadm
X-Git-Tag: v9.2.1~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=497c1f06a2e221631626ffb66bece310406a7491;p=ceph.git

krbd: remove deprecated --quiet param from udevadm

This parameter has been removed since systemd 213, so this
effects Fedora 21+, Debian Jessie, and potentially future
releases of RHEL 7.

Fixes: #13560
Backport: hammer, infernalis
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4300f2a9fe29627eea580564ff2d576de3647467)
---

diff --git a/src/krbd.cc b/src/krbd.cc
index 9901edbfb15..778c109fe4c 100644
--- a/src/krbd.cc
+++ b/src/krbd.cc
@@ -521,8 +521,7 @@ static int do_unmap(struct udev *udev, dev_t devno, const string& id)
          * libudev does not provide the "wait until the queue is empty"
          * API or the sufficient amount of primitives to build it from.
          */
-        string err = run_cmd("udevadm", "settle", "--timeout", "10", "--quiet",
-                             NULL);
+        string err = run_cmd("udevadm", "settle", "--timeout", "10", NULL);
         if (!err.empty())
           cerr << "rbd: " << err << std::endl;
       }