From e0993236d30a7f5a2dec1fd0e1b737879f209232 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 9 Sep 2022 05:25:55 +0900 Subject: [PATCH] blockdevi-util: also check sysname when enumerating partitions --- src/shared/blockdev-util.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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; -- 2.47.3