[systemd-devel] [systemd-commits] src/timedate

[Lennart Poettering]

On Wed, 30.10.13 08:07, Dave Reisner (dreisner at kemper.freedesktop.org) wrote:

>  src/timedate/timedated.c |    3 +++
>  1 file changed, 3 insertions(+)
> 
> New commits:
> commit 36f9f99556b2fd90705a9eda2e8f182b1e63a15e
> Author: Dave Reisner <dreisner at archlinux.org>
> Date:   Wed Oct 30 11:06:43 2013 -0400
> 
>     timedated: support --enable-split-usr

Wut? timedated runs after everything is mounted, so there's really no
point in allowing specification of NTP units in the rootprefix. What's
the use case here?

I am going to revert if that's OK?

> 
> diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
> index 3d450ca..9858f56 100644
> --- a/src/timedate/timedated.c
> +++ b/src/timedate/timedated.c
> @@ -248,6 +248,9 @@ 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;
> 
> _______________________________________________
> systemd-commits mailing list
> systemd-commits at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-commits


Lennart

-- 
Lennart Poettering, Red Hat