]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rbd-mirror: command line options should override environment
authorMykola Golub <mgolub@mirantis.com>
Thu, 17 Mar 2016 09:14:13 +0000 (11:14 +0200)
committerMykola Golub <mgolub@mirantis.com>
Thu, 17 Mar 2016 09:14:13 +0000 (11:14 +0200)
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
src/tools/rbd_mirror/main.cc

index 1236bf22f8266d3c73d7b89de6b7c0da37ba38c9..a21d5788141901bbd754ace28cf3bdd8b6a0ef34 100644 (file)
@@ -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,