From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Jun 2012 21:22:53 +0000 (+0200)
Subject: preset: don't look for preset files in /lib unless /usr is split off
X-Git-Tag: v186~131
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b4bdfefac3fcf633aa0700a981d854cc49a9725b

preset: don't look for preset files in /lib unless /usr is split off
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 40b137e43..718ec5276 100644
--- 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",