init-ceph: more c* -> ceph-* cleanup

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2011-09-26 14:25:54 -07:00
parent 9cb6c550b6
commit d27d9d8943

View File

@ -190,14 +190,14 @@ for name in $what; do
# start, and already running? (do this check early to avoid unnecessary work!)
if [ "$command" = "start" ]; then
if daemon_is_running $name c$type $id $pid_file; then
if daemon_is_running $name ceph-$type $id $pid_file; then
echo "Starting Ceph $name on $host...already running"
continue
fi
fi
# binary?
binary="$BINDIR/c$type"
binary="$BINDIR/ceph-$type"
if [ "$command" = "start" ]; then
get_conf copy_executable_to "" "copy executable to"
if [ -n "$copy_executable_to" ]; then
@ -285,7 +285,7 @@ for name in $what; do
get_conf pre_stop "" "pre stop command"
get_conf post_stop "" "post stop command"
[ -n "$pre_stop" ] && do_cmd "$pre_stop"
stop_daemon $name c$type $pid_file
stop_daemon $name ceph-$type $pid_file
[ -n "$post_stop" ] && do_cmd "$post_stop"
[ -n "$lockfile" ] && [ "$?" -eq 0 ] && rm -f $lockfile
if [ $dobtrfsumount -eq 1 ] && [ -n "$btrfs_devs" ]; then
@ -295,7 +295,7 @@ for name in $what; do
;;
status)
if daemon_is_running $name c$type $id $pid_file; then
if daemon_is_running $name ceph-$type $id $pid_file; then
echo "$name: running..."
else
echo "$name: dead."
@ -311,19 +311,19 @@ for name in $what; do
get_conf pre_forcestop "" "pre forcestop command"
get_conf post_forcestop "" "post forcestop command"
[ -n "$pre_forcestop" ] && do_cmd "$pre_forcestop"
stop_daemon $name c$type $pid_file -9
stop_daemon $name ceph-$type $pid_file -9
[ -n "$post_forcestop" ] && do_cmd "$post_forcestop"
[ -n "$lockfile" ] && [ "$?" -eq 0 ] && rm -f $lockfile
;;
killall)
echo "killall c$type on $host"
do_cmd "pkill ^c$type || true"
echo "killall ceph-$type on $host"
do_cmd "pkill ^ceph-$type || true"
[ -n "$lockfile" ] && [ "$?" -eq 0 ] && rm -f $lockfile
;;
force-reload | reload)
signal_daemon $name c$type $pid_file -1 "Reloading"
signal_daemon $name ceph-$type $pid_file -1 "Reloading"
;;
restart)