chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a422bb
)
preset: don't look for preset files in /lib unless /usr is split off
author
Lennart Poettering
<lennart@poettering.net>
Thu, 21 Jun 2012 21:22:53 +0000
(23:22 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 21 Jun 2012 21:22:53 +0000
(23:22 +0200)
src/shared/install.c
patch
|
blob
|
history
diff --git
a/src/shared/install.c
b/src/shared/install.c
index 40b137e437fecee8045fef4addc31e929732f489..718ec52769c731731b81e2fe288fdefb6e8ee725 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-1686,7
+1686,9
@@
int unit_file_query_preset(UnitFileScope scope, const char *name) {
"/etc/systemd/system.preset",
"/usr/local/lib/systemd/system.preset",
"/usr/lib/systemd/system.preset",
+#ifdef HAVE_SPLIT_USR
"/lib/systemd/system.preset",
+#endif
NULL);
else if (scope == UNIT_FILE_GLOBAL)
r = conf_files_list(&files, ".preset",