From 97753d17b6c59d63b11e3d675d182887994ba1e9 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 22 Dec 2016 18:21:18 +0100 Subject: [PATCH] ceph_fuse: pid_file default to empty Fixes: http://tracker.ceph.com/issues/18309 Signed-off-by: Nathan Cutler (cherry picked from commit 2258f2f1661893335583c987f2a33772e709f4a7) --- src/ceph_fuse.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ceph_fuse.cc b/src/ceph_fuse.cc index 06a1e4150040f..fa0a0854b6d0b 100644 --- a/src/ceph_fuse.cc +++ b/src/ceph_fuse.cc @@ -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 args; + std::vector 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 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::iterator i = args.begin(); i != args.end(); ) { -- 2.39.5