[systemd-commits] src/timedate

Lennart Poettering lennart at kemper.freedesktop.org
Thu Oct 31 11:21:34 CET 2013


 src/timedate/timedated.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit ebd495b0a190f51dc5ed90f58134054fadfbff1d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 31 11:20:33 2013 +0100

    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 62d79e2..f5d2201 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;



More information about the systemd-commits mailing list