]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
init-ceph.in: replace "/var/run/" by already used $RUN_DIR 57/head
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 14 Feb 2013 13:36:37 +0000 (14:36 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 14 Feb 2013 17:12:30 +0000 (18:12 +0100)
Fix handling of admin socket. The current script already use
$RUN_DIR to define a default, which is /var/run. Replace the
explicit path from get_conf call and replace it with $RUN_DIR.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/init-ceph.in

index 3513a6877339eaadeb2cded1167e826098629aca..5c8c951c66e3fc35534483a1df7306f558beb473 100644 (file)
@@ -334,7 +334,7 @@ for name in $what; do
 
        status)
            if daemon_is_running $name ceph-$type $id $pid_file; then
-               get_conf asok "/var/run/ceph/ceph-$type.$id.asok" "admin socket"
+               get_conf asok "$RUN_DIR/ceph/ceph-$type.$id.asok" "admin socket"
                echo -n "$name: running "
                do_cmd "$BINDIR/ceph --admin-daemon $asok version 2>/dev/null" || echo unknown
             elif [ -e "$pid_file" ]; then