init script bug with multiple clusters

[Amon Ott <a.ott@m-privacy.de>]

[-- Attachment #1: Type: text/plain, Size: 526 bytes --]

Hello Ceph!

The Ceph init script (src/init-ceph.in) creates pid files without
cluster names. This means that only one cluster can run at a time. The
solution is simple and works fine here, patch against 0.94 is attached.

Amon Ott
-- 
Dr. Amon Ott
m-privacy GmbH           Tel: +49 30 24342334
Werner-Voß-Damm 62       Fax: +49 30 99296856
12101 Berlin             http://www.m-privacy.de

Amtsgericht Charlottenburg, HRB 84946

Geschäftsführer:
 Dipl.-Kfm. Holger Maczkowsky,
 Roman Maczkowsky

GnuPG-Key-ID: 0x2DD3A649


[-- Attachment #2: mprivacy-ceph-init.diff --]
[-- Type: text/x-patch, Size: 407 bytes --]

--- ceph-0.93/src/init-ceph.in	2015-02-27 19:47:15.000000000 +0100
+++ ceph-0.93/src/init-ceph.in.mp	2015-04-07 13:29:47.127067864 +0200
@@ -227,7 +237,7 @@
 
     get_conf run_dir "/var/run/ceph" "run dir"
 
-    get_conf pid_file "$run_dir/$type.$id.pid" "pid file"
+    get_conf pid_file "$run_dir/$cluster-$type.$id.pid" "pid file"
 
     if [ "$command" = "start" ]; then
 	if [ -n "$pid_file" ]; then