From patchwork Mon Feb 5 12:46:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545462 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BDAF1CD08 for ; Mon, 5 Feb 2024 12:46:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137214; cv=none; b=DvHiSjA4/8jUuKEuwzfi4CNZs9NoUjK7TeumStnUerj1DYnnEJx1yGZ7F2BAvCYItkdeW9ovRzjkfMmHraMZxPp59izn6IM1TkT9hIFy8F+oclMAyKl5xaePTt/7dakTxgRb10D9sRP/HwZwHuGIgGTCH5m2uy3UFsIWj8QEQ+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137214; c=relaxed/simple; bh=CwLS1tCXQGaOMl4151yRpmTmM5aGbS5ECce8eIZx0EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TyfK8qXXa0+xo+WUcmn2FXHYk3iqCx4SPTe7DG9Pf1DhBsSMJ5oRa/29LWjxWS/nlUe4WFzFQIQP8xYi/YBVkcEwgk7BzG5LToRZ2OBSxy+/Hv8mSS/O2+qhEh9DV3wqEGtpEeEfYb3q5FMwXs7yrCEoMLhzwKW9SVZ4J1obb8k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=XiBSmZgv; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="XiBSmZgv" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40fdd5bbe65so4326565e9.2 for ; Mon, 05 Feb 2024 04:46:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137210; x=1707742010; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bD7Kg8XXkPr56bmFVSxt8Cn654XeP0exS5tfljsujs8=; b=XiBSmZgvGgkJZWytkyPVQAslZJHtpoj7L2ll6W3f2Ri7dmb8Ov+6i8azVAYJwBiGLK yHeXl0o+3USKsJMITlqXGen6jZ4BHGlRtEttWP0Pxkd99F5I/2JZVpGNGcKGrcsB9MRg o4i0dSISEhLpmIw2g0PZKMreD445+KbGE6qIXasIh7yemjjUmgInEAylOgz/tO6CguUJ fW6uLrj0FEDvFz2abYk/CjzOVYdOpUoSnt/B2+ypv/RoAXUhbIsfBUhUdTG1URM+Skq1 Uvd72+XmlQPI8ONJSm6nsiZ9leHq7T9leroKPXufu8AdLWlEFoxKApbH5FKoRf1AdHlB gOpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137210; x=1707742010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bD7Kg8XXkPr56bmFVSxt8Cn654XeP0exS5tfljsujs8=; b=DlecmLHZ8oHpbyNlsI+SK76cK4EG4u9jFV+hJCmGvsuuF9p8YelL4NTqxyNgTXwWL3 yiIv0ZcHP87kaxiAcbk07ZIyOY6lh/HcfnT9S53G/CAahwy6yAerykenTN+Iqj72LYfD aHWSf8VchBbFgDj9btAtzvgfVZb9IWGP2FTfc9f2mQz4xSFsJWfnUpCCkvumnqtICyXE TGVBOxHcizr9diNszIe2wsYVj36WSqEkfINmTdbKusL282eoW4N/sVTvVJ0Fpvtw3/mm ol0GIzt6iXYXEZXe3qTDHFnAE1bVUmASuflxrgY3+idMacwiKYpibjlLWz+KaM7Znmsr 9G6g== X-Gm-Message-State: AOJu0Yz81AteCBRyM5ofp7dkYWkpvr9MMBVWBQPEutBqrQ+Sh85g6IcP LKI2QDJMO9/gaZ5F3DKO+ZPxpac6DfUuaTeCmj6rVzB62i2Vhk4wteHnUtgM3PU= X-Google-Smtp-Source: AGHT+IFjOlAspad2BCbWKZoT4Ah66eV9BiwBiZ7ZB8Gl4vIMrbh5wG8EiZRAoW6Oco/vUhvv0+bk3A== X-Received: by 2002:a05:600c:1da6:b0:40f:afd6:b266 with SMTP id p38-20020a05600c1da600b0040fafd6b266mr4453912wms.18.1707137209384; Mon, 05 Feb 2024 04:46:49 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVxl9iffdyznSF3r8Ml2twEkVZorAKlEg5vZA5aGnw9DrcLPEfNhs0GpwJDvU+XLWl2BrCYOvWynOk5Y5guG8a12dWGBCsB6d6ycrD+TNMyy6uC12cnYZBwWU5ghKFI1pxh/L6ye6UpU0gQsS7FNOnRlgTSEBjv63McKIAcujzWO443+oo9PQ+4 Received: from localhost (dslb-002-202-118-224.002.202.pools.vodafone-ip.de. [2.202.118.224]) by smtp.gmail.com with UTF8SMTPSA id m21-20020a05600c3b1500b0040fd2f3dc0esm6652892wms.45.2024.02.05.04.46.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:49 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha Subject: [PATCH 3/6] 11-dm-mpath.rules: use import logic like 13-dm-disk.rules Date: Mon, 5 Feb 2024 13:46:35 +0100 Message-ID: <20240205124638.17877-4-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We have to import the properties if either DM_NOSCAN or DM_DISABLE_OTHER_RULES_FLAG is set, because blkid will be skipped in both cases. Also, if DM_UDEV_PRIMARY_SOURCE_FLAG is not set, it makes no sense to try and import the properties. Signed-off-by: Martin Wilck --- multipath/11-dm-mpath.rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules index 43d227c..8fc4a6f 100644 --- a/multipath/11-dm-mpath.rules +++ b/multipath/11-dm-mpath.rules @@ -89,7 +89,8 @@ ENV{MPATH_DEVICE_READY}!="0", ENV{.MPATH_DEVICE_READY_OLD}=="0", \ # not. If symlinks get lost, systemd may auto-unmount file systems. LABEL="scan_import" -ENV{DM_NOSCAN}!="1", GOTO="import_end" +ENV{DM_NOSCAN}!="1", ENV{DM_DISABLE_OTHER_RULES_FLAG}!="1", \ + ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="import_end" IMPORT{db}="ID_FS_TYPE" IMPORT{db}="ID_FS_USAGE" IMPORT{db}="ID_FS_UUID_ENC"