From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 31 Oct 2013 10:20:33 +0000 (+0100)
Subject: Revert "timedated: support --enable-split-usr"
X-Git-Tag: v209~1692
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ebd495b0a190f51dc5ed90f58134054fadfbff1d

Revert "timedated: support --enable-split-usr"

This reverts commit 36f9f99556b2fd90705a9eda2e8f182b1e63a15e.

The ntp unit information is only needed by timedated which runs in late
boot only, where all disks are around. Hence there's no point in
allowing them to be located in the rootprefix.
---

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 62d79e2eb..f5d2201ce 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -248,9 +248,6 @@ static char** get_ntp_services(void) {
                             "/run/systemd/ntp-units.d",
                             "/usr/local/lib/systemd/ntp-units.d",
                             "/usr/lib/systemd/ntp-units.d",
-#ifdef HAVE_SPLIT_USR
-                            "/lib/systemd/ntp-units.d",
-#endif
                             NULL);
         if (k < 0)
                 return NULL;