Merge pull request #6530 from SUSE/wip-13760-hammer

unknown argument --quiet in udevadm settle Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Jan 12, 2016 · e1b9208 · e1b9208
2 parents 9708e59 + 3d3595f
commit e1b9208
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/common/run_cmd.cc b/src/common/run_cmd.cc
@@ -47,6 +47,9 @@ std::string run_cmd(const char *cmd, ...)
   }
   else if (fret == 0) {
     // execvp doesn't modify its arguments, so the const-cast here is safe.
+    close(STDIN_FILENO);
+    close(STDOUT_FILENO);
+    close(STDERR_FILENO);
     execvp(cmd, (char * const*)&arr[0]);
     _exit(127);
   }

diff --git a/src/krbd.cc b/src/krbd.cc
@@ -435,8 +435,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;
       }