ctdb-scripts: Move "ERROR:" prefix out of ctdb_check_rpc()
authorMartin Schwenke <martin@meltin.net>
Mon, 29 Jun 2015 01:22:48 +0000 (11:22 +1000)
committerAmitay Isaacs <amitay@samba.org>
Tue, 14 Jul 2015 07:57:18 +0000 (09:57 +0200)
There will be warnings in addition to errors.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/config/functions

index 9623514f2fbe6a27b49d66ba212f36d6742e5db6..4b4ac7fc2069be46b6961da8a6c451dcc432ffa7 100755 (executable)
@@ -398,7 +398,7 @@ _nfs_check_rpc_action ()
     for _action in $_actions ; do
        case "$_action" in
            verbose)
-               echo "$ctdb_check_rpc_out"
+               echo "ERROR: $ctdb_check_rpc_out"
                ;;
            restart)
                _nfs_restart_rpc_service "$_prog_name"
@@ -481,7 +481,7 @@ ctdb_check_rpc ()
 
     if ! ctdb_check_rpc_out=$(rpcinfo -T $_family $_localhost \
                                      $_progname $_version 2>&1) ; then
-       ctdb_check_rpc_out="ERROR: $_progname failed RPC check:
+       ctdb_check_rpc_out="$_progname failed RPC check:
 $ctdb_check_rpc_out"
        echo "$ctdb_check_rpc_out"
        return 1