summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2010-10-28 13:34:33 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2010-10-28 13:35:55 +1100
commit14c8228292ce18b9ce046a02d995cd41db1df012 (patch)
tree1fc328ef5b9dedb724b4ae1c6cf3e28b044908fb
parent1638a63dbe65ac64337539a0cca4eb886bc320f9 (diff)
downloadsamba-14c8228292ce18b9ce046a02d995cd41db1df012.tar.gz
samba-14c8228292ce18b9ce046a02d995cd41db1df012.tar.xz
samba-14c8228292ce18b9ce046a02d995cd41db1df012.zip
Redirect the output from 00.ctdb pfetch to stdout.
Normally, the config.tdb database would not exist, so we do not need to spam syslog with a "config.tdb does not exist" message every time we start ctdb (This used to be ctdb commit 5792809b72e534161c5ca9ef5c9897abcb3b899c)
-rwxr-xr-xctdb/config/events.d/00.ctdb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index 1389ae4060..61f2031094 100755
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -16,7 +16,7 @@ update_config_from_tdb() {
# Pull optional ctdb configuration data out of config.tdb
PUBLICADDRESSESKEY='public-addresses:node#'`ctdb -t 1 xpnn|sed -e "s/.*://"`
rm -f $CTDB_VARDIR/state/public_addresses
- ctdb pfetch config.tdb $PUBLICADDRESSESKEY $CTDB_VARDIR/state/public_addresses
+ ctdb pfetch config.tdb $PUBLICADDRESSESKEY $CTDB_VARDIR/state/public_addresses 2>/dev/null
[ "$?" = "0" ] && [ `stat --format="%s" /etc/ctdb/state/public_addresses` != "0" ] && [ ! -z "$CTDB_PUBLIC_ADDRESSES" ] && {
diff $CTDB_VARDIR/state/public_addresses $CTDB_PUBLIC_ADDRESSES >/dev/null 2>/dev/null
[ $? = "0" ] || {