From: Mykola Golub <mgolub@mirantis.com>
Date: Thu, 17 Mar 2016 09:14:13 +0000 (+0200)
Subject: rbd-mirror: command line options should override environment
X-Git-Tag: v10.1.0~29^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3800e2ba63ab6e38b4b1dfd47d8e930ac1d73482;p=ceph-ci.git

rbd-mirror: command line options should override environment

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/tools/rbd_mirror/main.cc b/src/tools/rbd_mirror/main.cc
index 1236bf22f82..a21d5788141 100644
--- a/src/tools/rbd_mirror/main.cc
+++ b/src/tools/rbd_mirror/main.cc
@@ -32,8 +32,8 @@ static void handle_signal(int signum)
 int main(int argc, const char **argv)
 {
   std::vector<const char*> args;
-  argv_to_vec(argc, argv, args);
   env_to_vec(args);
+  argv_to_vec(argc, argv, args);
 
   global_init(nullptr, args, CEPH_ENTITY_TYPE_CLIENT,
 	      CODE_ENVIRONMENT_DAEMON,