From 3023509728ee541e7361688c0eb7f38cccb91f3d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 27 Oct 2009 08:39:02 -0700
Subject: [PATCH] default pid file /var/run/ceph/$type.$id.pid

---
 RELEASE_CHECKLIST | 1 -
 debian/ceph.dirs  | 1 +
 src/config.cc     | 2 +-
 src/init-ceph.in  | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE_CHECKLIST b/RELEASE_CHECKLIST
index 02f3d2352ddd2..92419a505d49b 100644
--- a/RELEASE_CHECKLIST
+++ b/RELEASE_CHECKLIST
@@ -10,7 +10,6 @@
 - commit
 - git tag version
 - build debs for amd64, i386
-- make dist, upload to ceph.newdream.net:ceph.newdream.net/downloads
 - email ml + post news entry
 
 - rebase kclient_clean
\ No newline at end of file
diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index aa72f8ab39cc3..cdcd57a04ed7d 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,5 +1,6 @@
 usr/bin
 var/log/ceph
 var/log/ceph/stat
+var/run/ceph
 etc/ceph
 usr/share/doc/ceph
diff --git a/src/config.cc b/src/config.cc
index 685af0977d59a..c5dd3dabe9ad9 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -306,7 +306,7 @@ static struct config_option config_optionsp[] = {
 	OPTION(log_dir, 0, OPT_STR, "/var/log/ceph"),		// if daemonize == true
 	OPTION(log_sym_dir, 0, OPT_STR, 0),
 	OPTION(log_to_stdout, 0, OPT_BOOL, true),
-	OPTION(pid_file, 0, OPT_STR, 0),
+	OPTION(pid_file, 0, OPT_STR, "/var/run/ceph/$type.$id.pid"),
 	OPTION(conf, 'c', OPT_STR, "/etc/ceph/ceph.conf"),
 	OPTION(chdir, 0, OPT_STR, "/"),
 	OPTION(fake_clock, 0, OPT_BOOL, false),
diff --git a/src/init-ceph.in b/src/init-ceph.in
index 3f7180dd352bc..6a946503bfc0e 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -180,7 +180,7 @@ for name in $what; do
 	first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
     fi
 
-    get_conf pid_file "" "pid file"
+    get_conf pid_file "/var/run/ceph/$type.$id.pid" "pid file"
 
     case "$command" in
 	start)
-- 
2.39.5