From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 8 Sep 2022 20:25:55 +0000 (+0900)
Subject: blockdevi-util: also check sysname when enumerating partitions
X-Git-Tag: v252-rc1~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0993236d30a7f5a2dec1fd0e1b737879f209232;p=thirdparty%2Fsystemd.git

blockdevi-util: also check sysname when enumerating partitions
---

diff --git a/src/shared/blockdev-util.c b/src/shared/blockdev-util.c
index 66807c673d1..82893a05163 100644
--- a/src/shared/blockdev-util.c
+++ b/src/shared/blockdev-util.c
@@ -543,6 +543,16 @@ static int partition_enumerator_new(sd_device *dev, sd_device_enumerator **ret)
         if (r < 0)
                 return r;
 
+        r = sd_device_get_sysname(dev, &s);
+        if (r < 0)
+                return r;
+
+        /* Also add sysname check for safety. Hopefully, this also improves performance. */
+        s = strjoina(s, "*");
+        r = sd_device_enumerator_add_match_sysname(e, s);
+        if (r < 0)
+                return r;
+
         r = sd_device_enumerator_add_match_subsystem(e, "block", /* match = */ true);
         if (r < 0)
                 return r;