]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph_fuse: pid_file default to empty
authorNathan Cutler <ncutler@suse.com>
Thu, 22 Dec 2016 17:21:18 +0000 (18:21 +0100)
committerNathan Cutler <ncutler@suse.com>
Thu, 5 Jan 2017 20:26:46 +0000 (21:26 +0100)
Fixes: http://tracker.ceph.com/issues/18309
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/ceph_fuse.cc

index f3ec612157996c50c0f22c42dd572c44bd873df5..b2d2b5d652b44f7485435eac0bf0be96380b30e9 100644 (file)
@@ -73,14 +73,16 @@ void usage()
 int main(int argc, const char **argv, const char *envp[]) {
   int filer_flags = 0;
   //cerr << "ceph-fuse starting " << myrank << "/" << world << std::endl;
-  vector<const char*> args;
+  std::vector<const char*> args;
   argv_to_vec(argc, argv, args);
   if (args.empty()) {
     usage();
   }
   env_to_vec(args);
 
-  auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
+  std::vector<const char*> def_args{"--pid-file="};
+
+  auto cct = global_init(&def_args, args, CEPH_ENTITY_TYPE_CLIENT,
                         CODE_ENVIRONMENT_DAEMON,
                         CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS);
   for (std::vector<const char*>::iterator i = args.begin(); i != args.end(); ) {