[systemd-commits] src/shared

Lennart Poettering lennart at kemper.freedesktop.org
Thu Jun 21 14:23:36 PDT 2012


 src/shared/install.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b4bdfefac3fcf633aa0700a981d854cc49a9725b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jun 21 23:22:53 2012 +0200

    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 40b137e..718ec52 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",



More information about the systemd-commits mailing list