Add 60.ganesha to what gets installed by make install as well as by the RPM

[sahlberg/ctdb.git] / tests / recover.sh

diff --git a/tests/recover.sh b/tests/recover.sh
index 57e2f422fe2f6e44446021ba036a4549d39c9a3a..c626441786b050a47e59527c2db5702e2bb80873 100755 (executable)
--- a/tests/recover.sh
+++ b/tests/recover.sh
@@ -1,15 +1,12 @@
 #!/bin/sh
 
 killall -q ctdbd
-killall -q recoverd
 
 echo "Starting 4 ctdb daemons"
-bin/ctdbd --nlist direct/4nodes.txt
-bin/ctdbd --nlist direct/4nodes.txt --listen=127.0.0.2:9001 --socket=/tmp/ctdb.socket.127.0.0.2
-bin/ctdbd --nlist direct/4nodes.txt --listen=127.0.0.3:9001 --socket=/tmp/ctdb.socket.127.0.0.3
-bin/ctdbd --nlist direct/4nodes.txt --listen=127.0.0.4:9001 --socket=/tmp/ctdb.socket.127.0.0.4
-echo "Starting one recovery daemon on node 0"
-bin/recoverd --socket=/tmp/ctdb.socket >/dev/null 2>/dev/null &
+bin/ctdbd --recovery-daemon --nlist tests/4nodes.txt
+bin/ctdbd --recovery-daemon --nlist tests/4nodes.txt --listen=127.0.0.2 --socket=/tmp/ctdb.socket.127.0.0.2
+bin/ctdbd --recovery-daemon --nlist tests/4nodes.txt --listen=127.0.0.3 --socket=/tmp/ctdb.socket.127.0.0.3
+bin/ctdbd --recovery-daemon --nlist tests/4nodes.txt --listen=127.0.0.4 --socket=/tmp/ctdb.socket.127.0.0.4
 
 echo
 echo "Attaching to some databases"