diff options
| author | John Lin <johnlinp@gmail.com> | 2018-01-05 13:15:42 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-01-05 13:15:42 +0100 |
| commit | 7c59ab4ba11f7ac2afc3dc4f3ba9c97b72c34750 (patch) | |
| tree | 16b17115109522265aebff1c1327b1a3a47fde5c /src/shared/install.c | |
| parent | Merge pull request #7763 from yuwata/fix-7761 (diff) | |
| download | systemd-7c59ab4ba11f7ac2afc3dc4f3ba9c97b72c34750.tar.xz systemd-7c59ab4ba11f7ac2afc3dc4f3ba9c97b72c34750.zip | |
install: search preset files in /run (#7715)
According to systemd.preset(5), presets files in /run should take
effect. However, before this patch, preset files in /run were
ignored.
Diffstat (limited to 'src/shared/install.c')
| -rw-r--r-- | src/shared/install.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index 05ccc586a9..026aa32302 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -2784,6 +2784,7 @@ static int read_presets(UnitFileScope scope, const char *root_dir, Presets *pres if (scope == UNIT_FILE_SYSTEM) r = conf_files_list(&files, ".preset", root_dir, 0, "/etc/systemd/system-preset", + "/run/systemd/system-preset", "/usr/local/lib/systemd/system-preset", "/usr/lib/systemd/system-preset", #if HAVE_SPLIT_USR @@ -2793,6 +2794,7 @@ static int read_presets(UnitFileScope scope, const char *root_dir, Presets *pres else if (scope == UNIT_FILE_GLOBAL) r = conf_files_list(&files, ".preset", root_dir, 0, "/etc/systemd/user-preset", + "/run/systemd/user-preset", "/usr/local/lib/systemd/user-preset", "/usr/lib/systemd/user-preset", NULL); |