From 55526d6577f82349bf6bb59816680d7483b61dff Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 12 Dec 2024 18:22:10 +0100 Subject: Merging upstream version 4.3+20241202. Signed-off-by: Daniel Baumann --- tests/templates/names_template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/templates/names_template') diff --git a/tests/templates/names_template b/tests/templates/names_template index c94245e..8060794 100644 --- a/tests/templates/names_template +++ b/tests/templates/names_template @@ -4,8 +4,6 @@ function names_create() { local NAME=$2 local NEG_TEST=$3 - is_raid_foreign $DEVNAME - if [[ -z "$NAME" ]]; then mdadm -CR "$DEVNAME" -l0 -n 1 $dev0 --force else @@ -34,6 +32,10 @@ function names_verify() { local WANTED_NAME="$3" local EXPECTED="" + # We don't know what is saved in metadata, but we know what to expect. Therfore check if + # expecation would be foreign (no hostname information). + is_raid_foreign $WANTED_NAME + local RES="$(mdadm -D --export $DEVNODE_NAME | grep MD_DEVNAME)" if [[ "$?" != "0" ]]; then echo "Cannot get details for $DEVNODE_NAME - unexpected devnode." -- cgit v1.2.3