picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fstab-generator: introduce an helper to write extra dependencies specified via the mount options 

No functional change.
This commit is contained in:
Franck Bui 2020-06-11 11:27:41 +02:00
parent 045c5faf5a
commit 6371e69b49
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/fstab-generator/fstab-generator.c
View File

@ -314,6 +314,29 @@ static int write_requires_mounts_for(FILE *f, const char *opts) {
return 0;
}
static int write_extra_dependencies(FILE *f, const char *opts) {
int r;
assert(f);
if (opts) {
r = write_after(f, opts);
if (r < 0)
return r;
r = write_requires_after(f, opts);
if (r < 0)
return r;
r = write_before(f, opts);
if (r < 0)
return r;
r = write_requires_mounts_for(f, opts);
if (r < 0)
return r;
}
return 0;
}
static int add_mount(
const char *dest,
const char *what,
@ -406,20 +429,9 @@ static int add_mount(
SET_FLAG(flags, NOFAIL, true);
}
if (opts) {
r = write_after(f, opts);
if (r < 0)
return r;
r = write_requires_after(f, opts);
if (r < 0)
return r;
r = write_before(f, opts);
if (r < 0)
return r;
r = write_requires_mounts_for(f, opts);
if (r < 0)
return r;
}
r = write_extra_dependencies(f, opts);
if (r < 0)
return r;
if (passno != 0) {
r = generator_write_fsck_deps(f, dest, what, where, fstype);