From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 22 Dec 2016 17:21:18 +0000 (+0100)
Subject: ceph_fuse: pid_file default to empty
X-Git-Tag: v12.0.0~271^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2258f2f1661893335583c987f2a33772e709f4a7;p=ceph.git

ceph_fuse: pid_file default to empty

Fixes: http://tracker.ceph.com/issues/18309
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc
index f3ec61215799..b2d2b5d652b4 100644
--- a/src/ceph_fuse.cc
+++ b/src/ceph_fuse.cc
@@ -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(); ) {