From 7cdc0872342e8834f224132867ea88ee04e050bf Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 11 May 2009 15:47:10 +1000 Subject: Be more consistent about keeping the host: prefix on array names. If an array name contains a "hostname:" prefix, then --assemble will tend to leave it there, while --incremental will strip it off (when chosing a device name during auto-assembly). Make this more consistent: strip the name off if we decide that the name will be treated as 'local'. Leave it on if it will be treated as 'foreign'. Signed-off-by: NeilBrown --- Assemble.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Assemble.c') diff --git a/Assemble.c b/Assemble.c index 2c52f074..e75c7e5e 100644 --- a/Assemble.c +++ b/Assemble.c @@ -515,6 +515,11 @@ int Assemble(struct supertype *st, char *mddev, conf_name_is_free(name)) trustworthy = LOCAL; + if (trustworthy == LOCAL && + strchr(name, ':')) + /* Ignore 'host:' prefix of name */ + name = strchr(name, ':')+1; + mdfd = create_mddev(mddev, name, ident->autof, trustworthy, chosen_name); if (mdfd < 0) { -- cgit v1.2.3