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

veritysetup-generator: only generate one set of deps on systemd-tmpfiles-setup-dev.service

Browse Source 
If both the data and the hash device are a regular file we might create
two sets of deps on s-t-s-d.s, which is of course redundant. Shorten the
code to only generate this once.

No change in behaviour.
This commit is contained in:
Lennart Poettering
2023-06-01 18:49:43 +02:00
parent bf1484c70a
commit 5dd0214707
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/veritysetup/veritysetup-generator.c
+14 -17
View File
@@ -311,7 +311,7 @@ static int create_disk(
*du_escaped = NULL, *hu_escaped = NULL, *name_escaped = NULL;
_cleanup_fclose_ FILE *f = NULL;
const char *dmname;
bool noauto, nofail, netdev;
bool noauto, nofail, netdev, need_loop = false;
int r;
assert(name);
@@ -386,30 +386,27 @@ static int create_disk(
"BindsTo=%s\n"
"After=%s\n",
dd, dd);
else
/* For loopback devices, add systemd-tmpfiles-setup-dev.service
dependency to ensure that loopback support is available in
the kernel (/dev/loop-control needs to exist) */
fprintf(f,
"RequiresMountsFor=%s\n"
"Requires=systemd-tmpfiles-setup-dev.service\n"
"After=systemd-tmpfiles-setup-dev.service\n",
du_escaped);
else {
fprintf(f, "RequiresMountsFor=%s\n", du_escaped);
need_loop = true;
}
if (path_startswith(hu, "/dev/"))
fprintf(f,
"BindsTo=%s\n"
"After=%s\n",
hd, hd);
else
/* For loopback devices, add systemd-tmpfiles-setup-dev.service
dependency to ensure that loopback support is available in
the kernel (/dev/loop-control needs to exist) */
else {
fprintf(f, "RequiresMountsFor=%s\n", hu_escaped);
need_loop = true;
}
if (need_loop)
/* For loopback devices, add systemd-tmpfiles-setup-dev.service dependency to ensure that
* loopback support is available in the kernel (/dev/loop-control needs to exist) */
fprintf(f,
"RequiresMountsFor=%s\n"
"Requires=systemd-tmpfiles-setup-dev.service\n"
"After=systemd-tmpfiles-setup-dev.service\n",
hu_escaped);
"After=systemd-tmpfiles-setup-dev.service\n");
r = generator_write_veritysetup_service_section(f, name, du_escaped, hu_escaped, roothash, options);
if (r < 0)