diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-09-12 16:57:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-09-13 11:42:31 +0200 |
| commit | b50846055ee7e846697ea9f7fcf959bf0bfb8066 (patch) | |
| tree | f499f446cea7437612a0edbfea1724e259b9c90d /src/shared/install.c | |
| parent | 586377fc92189657b41a6b76e5bca3fcaf015a46 (diff) | |
| download | systemd-b50846055ee7e846697ea9f7fcf959bf0bfb8066.tar.gz | |
exec-util,conf-files: skip non-executable files in execute_directories()
Fixes: #6787
Diffstat (limited to 'src/shared/install.c')
| -rw-r--r-- | src/shared/install.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/install.c b/src/shared/install.c index d0a291b819..9e4e0eaf6f 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -2662,7 +2662,7 @@ static int read_presets(UnitFileScope scope, const char *root_dir, Presets *pres assert(presets); if (scope == UNIT_FILE_SYSTEM) - r = conf_files_list(&files, ".preset", root_dir, + r = conf_files_list(&files, ".preset", root_dir, 0, "/etc/systemd/system-preset", "/usr/local/lib/systemd/system-preset", "/usr/lib/systemd/system-preset", @@ -2671,7 +2671,7 @@ static int read_presets(UnitFileScope scope, const char *root_dir, Presets *pres #endif NULL); else if (scope == UNIT_FILE_GLOBAL) - r = conf_files_list(&files, ".preset", root_dir, + r = conf_files_list(&files, ".preset", root_dir, 0, "/etc/systemd/user-preset", "/usr/local/lib/systemd/user-preset", "/usr/lib/systemd/user-preset", |