]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crushtool: don't parse any generic args
authorSage Weil <sage@newdream.net>
Thu, 14 Jul 2011 18:25:21 +0000 (11:25 -0700)
committerSage Weil <sage@newdream.net>
Thu, 14 Jul 2011 19:54:57 +0000 (12:54 -0700)
Notably, crushtool uses -c, which elsewhere means parse this config file.

Signed-off-by: Sage Weil <sage@newdream.net>
src/crushtool.cc

index 336d456f821159320007ef5056cb959a91a22216..9c6ba1cb139cfae736f28ec4001ad42d2f2f4733 100644 (file)
@@ -845,7 +845,8 @@ int main(int argc, const char **argv)
   map<int, int> device_weight;
   DEFINE_CONF_VARS(usage);
 
-  global_init(args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,
+  vector<const char *> empty_args;  // we use -c, don't confuse the generic arg parsing
+  global_init(empty_args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY,
              CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);