initscript: handle spaces in option values inserted into $CTDB_OPTIONS.

[metze/ctdb/wip.git] / config / ctdb.init

diff --git a/config/ctdb.init b/config/ctdb.init
index 96ffb1ece651069a2df0dc4da191be97614db2ff..b4df177e0ba1efd183b770ea93e9c5439e8c19ef 100755 (executable)
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -65,7 +65,7 @@ build_ctdb_options () {
        # then return
        [ -z "$2" -o \( -n "$3" -a "$3" != "$2" \) ] && return
 
-       val="$2"
+       val="'$2'"
        case "$1" in
            --*) sep="=" ;;
            -*)  sep=" " ;;
@@ -186,25 +186,26 @@ start() {
 
     case $init_style in
        valgrind)
-           valgrind -q --log-file=/var/log/ctdb_valgrind \
-               $ctdbd --valgrinding $CTDB_OPTIONS
+           eval valgrind -q --log-file=/var/log/ctdb_valgrind \
+               $ctdbd --valgrinding "$CTDB_OPTIONS"
            RETVAL=$?
            echo
            ;;
        suse)
-           startproc $ctdbd $CTDB_OPTIONS
+           eval startproc $ctdbd "$CTDB_OPTIONS"
            rc_status -v
            RETVAL=$?
            ;;
        redhat)
-           daemon $ctdbd $CTDB_OPTIONS
+           eval $ctdbd "$CTDB_OPTIONS"
            RETVAL=$?
+           [ $RETVAL -eq 0 ] && success || failure
            echo
            [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
            ;;
        debian)
-           start-stop-daemon --start --quiet --background \
-               --exec $ctdbd -- $CTDB_OPTIONS
+           eval start-stop-daemon --start --quiet --background \
+               --exec $ctdbd -- "$CTDB_OPTIONS"
            RETVAL=$?
            ;;
     esac