chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d74ab85
)
Revert "timedated: support --enable-split-usr"
author
Lennart Poettering
<lennart@poettering.net>
Thu, 31 Oct 2013 10:20:33 +0000
(11:20 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 31 Oct 2013 10:20:33 +0000
(11:20 +0100)
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.
src/timedate/timedated.c
patch
|
blob
|
history
diff --git
a/src/timedate/timedated.c
b/src/timedate/timedated.c
index 62d79e2ebb5d1fe82b24d4d4253e9f74bc5beadc..f5d2201cea6fb31687fa26da222f3ebd178e0d95 100644
(file)
--- 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;