mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
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)
This commit is contained in:
parent
6cf92b7c0a
commit
53c9643104
@ -176,7 +176,11 @@ get_node_with_property ()
|
|||||||
|
|
||||||
local prop_node=""
|
local prop_node=""
|
||||||
if [ "${ctdb_props##:${prop}:}" = "$ctdb_props" ] ; then
|
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
|
if [ $? -eq 0 ] ; then
|
||||||
ctdb_props="${ctdb_props}${ctdb_props:+ }:${prop}:${prop_node}"
|
ctdb_props="${ctdb_props}${ctdb_props:+ }:${prop}:${prop_node}"
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user