diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-12-19 13:14:03 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-01-21 20:23:03 +0100 |
| commit | 33a4c983428239894f282a77212f088758ee136e (patch) | |
| tree | d01b4197e5cea546263f4dac0bcdeff0764ea1a2 /src/fstab-generator | |
| parent | 56a061f508ec0c0331f8f258c5b4055ff0cc4968 (diff) | |
| download | systemd-33a4c983428239894f282a77212f088758ee136e.tar.gz | |
fstab-generator: line break a bit more systematically
Diffstat (limited to 'src/fstab-generator')
| -rw-r--r-- | src/fstab-generator/fstab-generator.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index e0f1076326..a75a74bb3c 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -174,8 +174,13 @@ static bool mount_in_initrd(struct mntent *me) { streq(me->mnt_dir, "/usr"); } -static int write_timeout(FILE *f, const char *where, const char *opts, - const char *filter, const char *variable) { +static int write_timeout( + FILE *f, + const char *where, + const char *opts, + const char *filter, + const char *variable) { + _cleanup_free_ char *timeout = NULL; char timespan[FORMAT_TIMESPAN_MAX]; usec_t u; @@ -208,8 +213,12 @@ static int write_mount_timeout(FILE *f, const char *where, const char *opts) { "x-systemd.mount-timeout\0", "TimeoutSec"); } -static int write_dependency(FILE *f, const char *opts, - const char *filter, const char *format) { +static int write_dependency( + FILE *f, + const char *opts, + const char *filter, + const char *format) { + _cleanup_strv_free_ char **names = NULL, **units = NULL; _cleanup_free_ char *res = NULL; char **s; @@ -230,6 +239,7 @@ static int write_dependency(FILE *f, const char *opts, r = unit_name_mangle_with_suffix(*s, "as dependency", 0, ".mount", &x); if (r < 0) return log_error_errno(r, "Failed to generate unit name: %m"); + r = strv_consume(&units, x); if (r < 0) return log_oom(); @@ -249,7 +259,8 @@ static int write_dependency(FILE *f, const char *opts, } static int write_after(FILE *f, const char *opts) { - return write_dependency(f, opts, "x-systemd.after", "After=%1$s\n"); + return write_dependency(f, opts, + "x-systemd.after", "After=%1$s\n"); } static int write_requires_after(FILE *f, const char *opts) { |