Blob Blame History Raw
From 8a0e831eafedb0aefc6aadab7ac1448cab6b7643 Mon Sep 17 00:00:00 2001
From: Dan Kenigsberg <danken@redhat.com>
Date: Wed, 23 Jan 2013 10:27:01 +0200
Subject: [PATCH 15/22] vdsmd.service: require either ntpd or chronyd

Fedora 18 ships with chronyd by default, which conflicts with ntpd. We
do not really care which one of the two is running, as long as the host
clock is synchronized. That's what requiring time-sync.target means.

Change-Id: Ie0605bea6d34c214aea8814a72a03e9ad2883fdb
Signed-off-by: Dan Kenigsberg <danken@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/11291
Reviewed-by: Zhou Zheng Sheng <zhshzhou@linux.vnet.ibm.com>
Reviewed-by: Antoni Segura Puimedon <asegurap@redhat.com>
Reviewed-on: http://gerrit.ovirt.org/11366
Reviewed-by: Federico Simoncelli <fsimonce@redhat.com>
Tested-by: Federico Simoncelli <fsimonce@redhat.com>
---
 vdsm/vdsmd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vdsm/vdsmd.service b/vdsm/vdsmd.service
index 6a650f4..9823b34 100644
--- a/vdsm/vdsmd.service
+++ b/vdsm/vdsmd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Virtual Desktop Server Manager
-Requires=multipathd.service libvirtd.service ntpd.service
+Requires=multipathd.service libvirtd.service time-sync.target
 Conflicts=libvirt-guests.service
 
 [Service]
-- 
1.8.1