summaryrefslogtreecommitdiff
path: root/src/cryptsetup
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-23 16:30:23 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-26 14:08:46 +0100
commit49fe5c099639aa2111efb56c6ac609955a279279 (patch)
treebff451fbe68b0aa57fe8ad198695384eab264545 /src/cryptsetup
parent52f1552073047195d51901f7e5a5a4fa3189034e (diff)
downloadsystemd-49fe5c099639aa2111efb56c6ac609955a279279.tar.gz
tree-wide: port various places over to STARTSWITH_SET()
Diffstat (limited to 'src/cryptsetup')
-rw-r--r--src/cryptsetup/cryptsetup-generator.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 7da13dc207..b0b1065e2f 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -510,11 +510,9 @@ static int add_crypttab_devices(void) {
continue;
}
- uuid = startswith(device, "UUID=");
+ uuid = STARTSWITH_SET(device, "UUID=", "luks-");
if (!uuid)
uuid = path_startswith(device, "/dev/disk/by-uuid/");
- if (!uuid)
- uuid = startswith(name, "luks-");
if (uuid)
d = hashmap_get(arg_disks, uuid);