summaryrefslogtreecommitdiffstats
path: root/config.d
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-06-18 13:06:36 +1000
committerMartin Schwenke <martin@meltin.net>2014-06-25 20:46:16 +1000
commit0852b535992942770e5adbb40ce78eaaf70a912b (patch)
tree62933e7300e6aa40a749dc49d31721a4cd80326a /config.d
parente455cf20ca5f38a4c677c6d9a9ec851692082282 (diff)
downloadautocluster-0852b535992942770e5adbb40ce78eaaf70a912b.tar.gz
autocluster-0852b535992942770e5adbb40ce78eaaf70a912b.tar.xz
autocluster-0852b535992942770e5adbb40ce78eaaf70a912b.zip
Fix the value of NETWORK_PRIVATE_PREFIX when there are options
The current calculation is incorrect when the private network has options. This causes broken hosts and CTDB nodes files. Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'config.d')
-rw-r--r--config.d/00base.defconf3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index 37748cc..f045073 100644
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -276,7 +276,8 @@ networks_post_config_hook ()
# Convenience variables
set -- $NETWORKS
NETWORK_PRIVATE="$1" ; shift
- NETWORK_PRIVATE_PREFIX="${NETWORK_PRIVATE%.*}"
+ local t="${NETWORK_PRIVATE%%,*}"
+ NETWORK_PRIVATE_PREFIX="${t%.*}"
NETWORKS_PUBLIC="$*"
}