dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 14:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cryptsetup-generator: fix luks-* entry parsing from crypttab

Browse Source 
This reverts a part of commit 49fe5c0996 ('tree-wide: port various places
over to STARTSWITH_SET()') that replaced a pair of startswith() calls
with STARTSWITH_SET().

They were in fact for a different strings (device vs. name), botching
the crypttap parsing.
This commit is contained in:
Lubomir Rintel
2019-06-27 13:02:28 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent cc82851c0d
commit 844d5a87c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptsetup/cryptsetup-generator.c
View File

@@ -546,9 +546,11 @@ static int add_crypttab_devices(void) {
continue;
}
uuid = STARTSWITH_SET(device, "UUID=", "luks-");
uuid = startswith(device, "UUID=");
if (!uuid)
uuid = path_startswith(device, "/dev/disk/by-uuid/");
if (!uuid)
uuid = startswith(name, "luks-");
if (uuid)
d = hashmap_get(arg_disks, uuid);