diff options
| author | Laszlo Boszormenyi <gcs@debian.hu> | 2012-02-26 20:47:53 -0800 |
|---|---|---|
| committer | Sage Weil <sage.weil@dreamhost.com> | 2012-02-26 20:47:53 -0800 |
| commit | 41295b584a682f452e911eda5f7890bb0018a1c2 (patch) | |
| tree | 89e3392dbef8ec423d4d0637e9e143c6ccd1f518 | |
| parent | 0d8b5756e187a21321609acd0e277b4a5e76d47a (diff) | |
| download | ceph-41295b584a682f452e911eda5f7890bb0018a1c2.tar.gz | |
debian: /var/run/ceph -> /run/ceph
/run/ceph should exists for creating UNIX domain sockets
ceph uses UNIX domain sockets for internal communication. Create their
directory on startup as /run is on a virtual filesystem.
Last-Update: <2012-02-26>
Bug-Debian: http://bugs.debian.org/660238
Forwarded: <ceph-devel@vger.kernel.org>
Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
| -rw-r--r-- | src/init-ceph.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/init-ceph.in b/src/init-ceph.in index 2deed19d2e7..eb58a5c0a15 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -12,6 +12,8 @@ # Description: Enable Ceph distributed file system services. ### END INIT INFO +RUN_DIR=/run/ceph + # if we start up as ./mkcephfs, assume everything else is in the # current directory too. if [ `dirname $0` = "." ] && [ $PWD != "/etc/init.d" ]; then @@ -173,7 +175,7 @@ for name in $what; do check_host || continue - get_conf pid_file "/var/run/ceph/$type.$id.pid" "pid file" + get_conf pid_file "$RUN_DIR/$type.$id.pid" "pid file" [ -n "$pid_file" ] && do_cmd "mkdir -p "`dirname $pid_file` get_conf log_dir "" "log dir" @@ -266,6 +268,7 @@ for name in $what; do do_root_cmd "modprobe btrfs ; btrfs device scan || btrfsctl -a ; egrep -q '^[^ ]+ $btrfs_path' /proc/mounts || mount -t btrfs $btrfs_opt $first_dev $btrfs_path" fi echo Starting Ceph $name on $host... + mkdir -p $RUN_DIR get_conf pre_start_eval "" "pre start eval" [ -n "$pre_start_eval" ] && $pre_start_eval get_conf pre_start "" "pre start command" |