[SCM] CTDB repository - branch master updated - ctdb-1.13-233-g5b2725d
Amitay Isaacs
amitay at samba.org
Thu Jul 26 06:08:37 MDT 2012
The branch, master has been updated
via 5b2725d1ae052e848c2487cb10c5393a877d118c (commit)
from 6616a5712b5d4db2b9ba6a88cec79378696c2184 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5b2725d1ae052e848c2487cb10c5393a877d118c
Author: Martin Schwenke <martin at meltin.net>
Date: Tue Jul 17 15:45:45 2012 +1000
Initscript: clean up drop_all_public_ips()
This makes the case implicit where $CTDB_PUBLIC_ADDRESSES is unset.
This is OK because that's not an interesting code path.
Signed-off-by: Martin Schwenke <martin at meltin.net>
-----------------------------------------------------------------------
Summary of changes:
config/ctdb.init | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.init b/config/ctdb.init
index 5d01a9c..71b187a 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -244,13 +244,9 @@ wait_until_ready () {
ctdbd=${CTDBD:-/usr/sbin/ctdbd}
drop_all_public_ips() {
- [ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
- return
- }
-
- cat $CTDB_PUBLIC_ADDRESSES | while read IP IFACE REST; do
- ip addr del $IP dev $IFACE >/dev/null 2>/dev/null
- done
+ while read _ip _iface _rest; do
+ ip addr del $_ip dev $_iface >/dev/null 2>&1
+ done <"${CTDB_PUBLIC_ADDRESSES:-/dev/null}"
}
start() {
--
CTDB repository
More information about the samba-cvs
mailing list