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

diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index cdcd57a04ed7d1dffa9c359bf03e641af181e607..aa72f8ab39cc347ce2bf258a5dd25fbd223c53a8 100644 (file)
--- 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 d08a71ce3d395a79ef14935f61f0089baba413e2..225828b30bf1105a67f2e71145e531e79c08678c 100644 (file)
--- 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)