diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-11 10:41:44 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-11 10:45:33 +0200 |
| commit | c36207708778a83d2c84c11dd522ce732d65527f (patch) | |
| tree | 06527b02535dcedbe531ea4299f809a1873a4cd1 /src/core/automount.c | |
| parent | 349176ae6c095725ddc11599dd03c7f16a5bb099 (diff) | |
| download | systemd-c36207708778a83d2c84c11dd522ce732d65527f.tar.gz | |
core: turn unit_load_fragment_and_dropin_optional() into a flag
unit_load_fragment_and_dropin() and unit_load_fragment_and_dropin_optional()
are really the same, with one minor difference in behaviour. Let's drop
the second function.
"_optional" in the name suggests that it's the "dropin" part that is optional.
(Which it is, but in this case, we mean the fragment to be optional.)
I think the new version with a flag is easier to understand.
Diffstat (limited to 'src/core/automount.c')
| -rw-r--r-- | src/core/automount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index a54e56c312..c15520c1e5 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -209,7 +209,7 @@ static int automount_load(Unit *u) { assert(u->load_state == UNIT_STUB); /* Load a .automount file */ - r = unit_load_fragment_and_dropin(u); + r = unit_load_fragment_and_dropin(u, true); if (r < 0) return r; |