From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 3 Jul 2012 13:37:04 +0000 (+0200)
Subject: timedate: uniq'ify ntp units list
X-Git-Tag: v186~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=f6c13ce47ebee287f8b6a965ca5ca022a9f26e2c

timedate: uniq'ify ntp units list
---

diff --git a/NEWS b/NEWS
index 82955f909..3c7c08619 100644
--- a/NEWS
+++ b/NEWS
@@ -124,7 +124,7 @@ CHANGES WITH 186:
           additional capabilities to the container.
 
         * timedated will now read known NTP implementation unit names
-          from /usr/share/systemd/ntp-units,
+          from /usr/share/systemd/ntp-units.d/*.list,
           systemd-timedated-ntp.target has been removed.
 
         * journalctl gained a new switch "-b" that lists log data of
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 5387699bf..237eb2489 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -354,7 +354,7 @@ static char** get_ntp_services(void) {
 
         strv_free(files);
 
-        return r;
+        return strv_uniq(r);
 }
 
 static int read_ntp(DBusConnection *bus) {