--- init-ceph.orig 2010-11-01 10:52:57.493637313 -0400 +++ init-ceph 2010-10-28 12:50:21.051977786 -0400 @@ -29,13 +29,6 @@ fi fi -# do lockfile, if RH -if [ -d /var/lock/subsys ]; then - lockfile=/var/lock/subsys/ceph -else - lockfile="" -fi - usage_exit() { echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..." printf "\t-c ceph.conf\n" @@ -186,6 +179,14 @@ check_host || continue + #Added new var EBB 28oct2010 + # do lockfile, if RH + if [ -d /var/lock/subsys ]; then + get_conf lockfile "/var/lock/subsys/ceph" "lock file" + else + lockfile="" + fi + get_conf pid_file "/var/run/ceph/$type.$id.pid" "pid file" [ -n "$pid_file" ] && mkdir -p `dirname $pid_file`