SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34877 from aafeijoo-suse/veritysetup-fixes

Browse Source 
veritysetup-generator: minor man/code changes
This commit is contained in:
Lennart Poettering
2024-10-25 10:06:31 +02:00
committed by GitHub
parent c4363051e4 11de19f3da
commit c18ac81f17
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/veritysetup/veritysetup-generator.c
-9
View File
@@ -453,7 +453,6 @@ static int add_veritytab_devices(void) {
for (;;) {
_cleanup_free_ char *line = NULL, *name = NULL, *data_device = NULL, *hash_device = NULL,
*roothash = NULL, *options = NULL;
char *data_uuid, *hash_uuid;
r = read_stripped_line(f, LONG_LINE_MAX, &line);
if (r < 0)
@@ -472,14 +471,6 @@ static int add_veritytab_devices(void) {
continue;
}
data_uuid = startswith(data_device, "UUID=");
if (!data_uuid)
data_uuid = path_startswith(data_device, "/dev/disk/by-uuid/");
hash_uuid = startswith(hash_device, "UUID=");
if (!hash_uuid)
hash_uuid = path_startswith(hash_device, "/dev/disk/by-uuid/");
r = create_veritytab_device(
name,
data_device,