diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-05-11 14:43:17 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-05-12 08:58:57 +1000 |
| commit | 53c96431041ed71a047c2637fd41bd64cca0a853 (patch) | |
| tree | afe1190d766c5d8d07aca72ef7405c660be4e4a0 /ctdb/tools/onnode | |
| parent | 6cf92b7c0aa1da40eda5ba2b98a068d7d91a430e (diff) | |
| download | samba-53c96431041ed71a047c2637fd41bd64cca0a853.tar.gz samba-53c96431041ed71a047c2637fd41bd64cca0a853.tar.xz samba-53c96431041ed71a047c2637fd41bd64cca0a853.zip | |
Fix lvsmaster and natgwlist nodespecs.
They both need to use a -Y option to ctdb and for natgwlist we only
want the 1st line.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit e781ff61e17d733349021bb036514f823c7cbfbb)
Diffstat (limited to 'ctdb/tools/onnode')
| -rwxr-xr-x | ctdb/tools/onnode | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index b3fae33b32..d7adbb05af 100755 --- a/ctdb/tools/onnode +++ b/ctdb/tools/onnode @@ -176,7 +176,11 @@ get_node_with_property () local prop_node="" if [ "${ctdb_props##:${prop}:}" = "$ctdb_props" ] ; then - prop_node=$(ctdb "$prop" 2>/dev/null) + prop_node=$(ctdb "$prop" -Y 2>/dev/null) + # We only want the first line. + local nl=" +" + prop_node="${prop_node%%${nl}*}" if [ $? -eq 0 ] ; then ctdb_props="${ctdb_props}${ctdb_props:+ }:${prop}:${prop_node}" else |