Skip to content

Commit

Permalink
install: search preset files in /run (systemd#7715)
Browse files Browse the repository at this point in the history
According to systemd.preset(5), presets files in /run should take
effect. However, before this patch, preset files in /run were
ignored.
  • Loading branch information
johnlinp authored and keszybz committed Jan 5, 2018
1 parent 5035800 commit 7c59ab4
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/shared/install.c
Expand Up @@ -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
Expand All @@ -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);
Expand Down

0 comments on commit 7c59ab4

Please sign in to comment.