From 84c33dd6d41c5b45288ca4059b781fe6fbd5bbad Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 21 Feb 2024 18:13:39 +0100 Subject: Merging upstream version 4.3. Signed-off-by: Daniel Baumann --- tests/templates/names_template | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'tests/templates/names_template') diff --git a/tests/templates/names_template b/tests/templates/names_template index 6181bfa..1b6cd14 100644 --- a/tests/templates/names_template +++ b/tests/templates/names_template @@ -63,8 +63,7 @@ function names_verify() { names_make_conf() { local UUID="$1" local WANTED_DEVNAME="$2" - local WANTED_NAME="$3" - local CONF="$4" + local CONF="$3" local LINE="ARRAY metadata=1.2 UUID=$UUID" @@ -72,9 +71,5 @@ names_make_conf() { LINE="$LINE $WANTED_DEVNAME" fi - if [[ "$WANTED_NAME" != "empty" ]]; then - LINE="$LINE name=$WANTED_NAME" - fi - echo $LINE > $CONF } -- cgit v1.2.3