From: Sage Weil <sage@newdream.net>
Date: Tue, 9 Feb 2010 18:20:20 +0000 (-0800)
Subject: debian: do not include var/run/ceph in package; mkdir -p dirname unconditionally
X-Git-Tag: v0.19~69
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=469d089bec7d268e4adacd32bc057e392b520fe2;p=ceph.git

debian: do not include var/run/ceph in package; mkdir -p dirname unconditionally
---

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index cdcd57a04ed7..aa72f8ab39cc 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,6 +1,5 @@
 usr/bin
 var/log/ceph
 var/log/ceph/stat
-var/run/ceph
 etc/ceph
 usr/share/doc/ceph
diff --git a/src/init-ceph.in b/src/init-ceph.in
index d08a71ce3d39..225828b30bf1 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -191,6 +191,7 @@ for name in $what; do
     fi
 
     get_conf pid_file "/var/run/ceph/$type.$id.pid" "pid file"
+    [ -n "$pid_file" ] && mkdir -p `dirname $pid_file`
 
     case "$command" in
 	start)