]> git.apps.os.sepia.ceph.com Git - ceph.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>
Fri, 6 Jan 2017 15:41:45 +0000 (16:41 +0100)
Fixes: http://tracker.ceph.com/issues/18309
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 2258f2f1661893335583c987f2a33772e709f4a7)

src/ceph_fuse.cc

index 06a1e4150040f8fbacb6e204b4821c4cafb842f9..fa0a0854b6d0b4da1201671b5c41fe171bb66bb0 100644 (file)
@@ -71,14 +71,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(); ) {