install: search preset files in /run (#7715)
authorJohn Lin <johnlinp@gmail.com>
Fri, 5 Jan 2018 12:15:42 +0000 (20:15 +0800)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 5 Jan 2018 12:15:42 +0000 (13:15 +0100)
According to systemd.preset(5), presets files in /run should take
effect. However, before this patch, preset files in /run were
ignored.

src/shared/install.c

index 05ccc58..026aa32 100644 (file)
@@ -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);