← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ctdb/vivid-proposed

« back to all changes in this revision

Viewing changes to tests/scripts/ctdb_test_functions.bash

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Parent
  • Date: 2010-02-10 19:39:13 UTC
  • mfrom: (1.2.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100210193913-c2kyhrx49cj64z72
Tags: 1.0.111.really.1.0.108-1
* Back to 1.0.108 which works better with samba 3.4.x and 3.5.0
  (See <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/
  2010-February/009100.html>)
* Cheery pick some commits from 1.0.108-3 to 1.0.111-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/scripts/ctdb_test_functions.bash
679
679
        echo "Node $no_public_ips will have no public IPs."
680
680
    fi
681
681
 
682
 
    local ctdb_options="--reclock=$var_dir/rec.lock --nlist $nodes --nopublicipcheck --event-script-dir=$CTDB_DIR/tests/events.d --logfile=$var_dir/daemons.log -d 0 --dbdir=$var_dir/test.db --dbdir-persistent=$var_dir/test.db/persistent --dbdir-state=$var_dir/test.db/state"
 
682
    local ctdb_options="--reclock=$var_dir/rec.lock --nlist $nodes --nopublicipcheck --event-script-dir=$CTDB_DIR/tests/events.d --logfile=$var_dir/daemons.log -d 0 --dbdir=$var_dir/test.db --dbdir-persistent=$var_dir/test.db/persistent"
683
683
 
684
684
    if [ $(id -u) -eq 0 ]; then
685
685
        ctdb_options="$ctdb_options --public-interface=lo"