[Pkg-ceph-commits] [ceph] 02/02: ceph-conf-no-log.patch: remove "no admin_socket" part (reverted upstream)

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit fa86829 (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Mar 29 01:35:55 2014

    ceph-conf-no-log.patch: remove "no admin_socket" part (reverted upstream)
---
 debian/patches/ceph-conf-no-log.patch | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/patches/ceph-conf-no-log.patch b/debian/patches/ceph-conf-no-log.patch
index 859b4cb..0a4bacc 100644
--- a/debian/patches/ceph-conf-no-log.patch
+++ b/debian/patches/ceph-conf-no-log.patch
@@ -1,7 +1,6 @@
 Last-Update: 2014-03-28
 Forwarded: not-needed
 Origin: upstream, http://tracker.ceph.com/projects/ceph/repository/revisions/acc31e75a3e7115c00f9980609948455e3b2d49e/diff/
-Origin: upstream, http://tracker.ceph.com/projects/ceph/repository/revisions/72715b235a0daee7ab8e5cd3ab6e415de2939df9/diff/
 Bug-Ceph: http://tracker.ceph.com/issues/7849
 Author: Sage Weil <sage at inktank.com>
 Description: prevent 'ceph-conf' from making log files
@@ -12,15 +11,10 @@ Description: prevent 'ceph-conf' from making log files
     .
     This isn't super pretty, but it is much less intrusive that wiring a 'do
     not log' flag down into CephContext and a zillion other places.
-    .
-    Subject: ceph-conf: no admin_socket
-    .
-    We don't need to worry about pidfile because that is done by the fork
-    functions, which ceph-conf doesn't call.
 
 --- a/src/tools/ceph_conf.cc
 +++ b/src/tools/ceph_conf.cc
-@@ -157,8 +157,15 @@
+@@ -157,8 +157,13 @@
    argv_to_vec(argc, argv, args);
    env_to_vec(args);
    vector<const char*> orig_args = args;
@@ -29,8 +23,6 @@ Description: prevent 'ceph-conf' from making log files
 +  args.push_back("");
 +  args.push_back("--no-log-to-stderr");
 +  args.push_back("--no-log-to-syslog");
-+  args.push_back("--admin-socket");
-+  args.push_back("");
 +
    global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
  	      CINIT_FLAG_NO_DAEMON_ACTIONS);

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git