[systemd-commits] 2 commits - src/path-lookup.c src/systemd.pc.in

[Lennart Poettering]

 src/path-lookup.c |    2 +-
 src/systemd.pc.in |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9d648202eb014f63484378fab5311eb3aae67563
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 14 14:31:57 2012 +0100

    pkg-config: bring unit search path order in sync with the code

diff --git a/src/systemd.pc.in b/src/systemd.pc.in
index 61de305..79470f4 100644
--- a/src/systemd.pc.in
+++ b/src/systemd.pc.in
@@ -12,8 +12,8 @@ systemdsystemunitdir=@systemunitdir@
 systemduserunitdir=@userunitdir@
 systemdsystemconfdir=@pkgsysconfdir@/system
 systemduserconfdir=@pkgsysconfdir@/user
-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir}
-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir}
+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system
+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user
 
 Name: systemd
 Description: systemd System and Service Manager

commit b412ab3bcca61cf4402a6df2888b22ce88eaee08
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Mar 14 14:31:50 2012 +0100

    path-lookup: rearrange things so that the system path order follows the user path order

diff --git a/src/path-lookup.c b/src/path-lookup.c
index e6f050d..5464ced 100644
--- a/src/path-lookup.c
+++ b/src/path-lookup.c
@@ -228,8 +228,8 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal
                                               "/etc/systemd/system",
                                               "/run/systemd/system",
                                               "/usr/local/lib/systemd/system",
-                                              "/usr/lib/systemd/system",
                                               SYSTEM_DATA_UNIT_PATH,
+                                              "/usr/lib/systemd/system",
 #ifdef HAVE_SPLIT_USR
                                               "/lib/systemd/system",
 #endif