[gnome-settings-daemon] datetime: Allow chrony to be used on Fedora

[Bastien Nocera <hadess src gnome org>]

commit bcf00c394e71bde04698e51a6930cb8d2940aadf
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Tue Sep 6 13:41:15 2011 +0100

    datetime: Allow chrony to be used on Fedora
    
    This patch adds support for chrony, the default NTP client in Fedora 16.
    
    Fedora feature page:
    http://fedoraproject.org/wiki/Features/ChronyDefaultNTP
    Original Fedora bug:
    https://bugzilla.redhat.com/show_bug.cgi?id=723212
    
    https://bugzilla.gnome.org/show_bug.cgi?id=655119

 plugins/datetime/gsd-datetime-mechanism-fedora.c |   29 +++++++++++++++++++---
 1 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/plugins/datetime/gsd-datetime-mechanism-fedora.c b/plugins/datetime/gsd-datetime-mechanism-fedora.c
index 9333d24..74fcf0e 100644
--- a/plugins/datetime/gsd-datetime-mechanism-fedora.c
+++ b/plugins/datetime/gsd-datetime-mechanism-fedora.c
@@ -28,6 +28,18 @@
 #include "gsd-datetime-mechanism-fedora.h"
 #include "gsd-datetime-mechanism.h"
 
+/* Return the name of the installed NTP client, prefer chrony if both chrony
+ * and ntp are installed */
+static const char *
+get_ntp_client ()
+{
+        if (g_file_test ("/etc/chrony.conf", G_FILE_TEST_EXISTS))
+                return "chronyd";
+        else if (g_file_test ("/etc/ntp.conf", G_FILE_TEST_EXISTS))
+                return "ntpd";
+        return NULL;
+}
+
 gboolean
 _get_using_ntp_fedora  (DBusGMethodInvocation   *context)
 {
@@ -35,10 +47,14 @@ _get_using_ntp_fedora  (DBusGMethodInvocation   *context)
         GError *error = NULL;
         gboolean can_use_ntp;
         gboolean is_using_ntp;
+        const char *ntp_client;
+        char *cmd;
 
-        if (g_file_test ("/etc/ntp.conf", G_FILE_TEST_EXISTS)) {
+        ntp_client = get_ntp_client ();
+        if (ntp_client) {
                 can_use_ntp = TRUE;
-                if (!g_spawn_command_line_sync ("/sbin/service ntpd status",
+                cmd = g_strconcat ("/sbin/service ", ntp_client, " status", NULL);
+                if (!g_spawn_command_line_sync (cmd,
                                                 NULL, NULL, &exit_status, &error)) {
                         GError *error2;
                         error2 = g_error_new (GSD_DATETIME_MECHANISM_ERROR,
@@ -47,8 +63,10 @@ _get_using_ntp_fedora  (DBusGMethodInvocation   *context)
                         g_error_free (error);
                         dbus_g_method_return_error (context, error2);
                         g_error_free (error2);
+                        g_free (cmd);
                         return FALSE;
                 }
+                g_free (cmd);
                 if (exit_status == 0)
                         is_using_ntp = TRUE;
                 else
@@ -69,13 +87,16 @@ _set_using_ntp_fedora  (DBusGMethodInvocation   *context,
 {
         GError *error;
         int exit_status;
+        const char *ntp_client;
         char *cmd;
 
         error = NULL;
 
+        ntp_client = get_ntp_client ();
+
         /* We omit --level 2345 so that systemd doesn't try to use the
          * SysV init scripts */
-        cmd = g_strconcat ("/sbin/chkconfig ntpd ", using_ntp ? "on" : "off", NULL);
+        cmd = g_strconcat ("/sbin/chkconfig ", ntp_client, " ", using_ntp ? "on" : "off", NULL);
 
         if (!g_spawn_command_line_sync (cmd,
                                         NULL, NULL, &exit_status, &error)) {
@@ -92,7 +113,7 @@ _set_using_ntp_fedora  (DBusGMethodInvocation   *context,
 
         g_free (cmd);
 
-        cmd = g_strconcat ("/sbin/service ntpd ", using_ntp ? "restart" : "stop", NULL);;
+        cmd = g_strconcat ("/sbin/service ", ntp_client, " ", using_ntp ? "restart" : "stop", NULL);;
 
         if (!g_spawn_command_line_sync (cmd,
                                         NULL, NULL, &exit_status, &error)) {