Merge pull request #2861 from lindig/CA-234876

CA 234876: make sure Xapi starts after system time is set, clean up startup

Author: robhoes

scripts/OMakefile

@@ -42,10 +42,7 @@ install:
 	$(IDATA) xapi.conf $(DESTDIR)$(XAPICONF)
 	$(IPROG) db.conf.skel $(DESTDIR)$(ETCDIR)/db.conf
 	$(IPROG) rio.db.conf.skel $(DESTDIR)$(ETCDIR)/db.conf.rio
-	mkdir -p $(DESTDIR)/etc/init.d
-	mkdir -p $(DESTDIR)/etc/rc.d/init.d
 	$(IPROG) init.d-xapi $(DESTDIR)$(LIBEXECDIR)/xapi-init
-	$(IPROG) init.d-xapi-compat $(DESTDIR)/etc/init.d/xapi
 	$(IPROG) init.d-xapissl $(DESTDIR)$(LIBEXECDIR)/xapissl
 	$(IPROG) init.d-management-interface $(DESTDIR)$(LIBEXECDIR)/legacy-management-interface
 	$(IPROG) init.d-save-boot-info $(DESTDIR)$(LIBEXECDIR)/save-boot-info

scripts/init.d-xapi-compat

@@ -1,6 +1,21 @@
 [Unit]
 Description=XenAPI server (XAPI)
-After=syslog.target forkexecd.service xcp-networkd.service message-switch.service v6d.service save-boot-info.service attach-static-vdis.service genptoken.service xcp-rrdd.service xapi-storage-script.service xenopsd-xc.service xenstored.service xcp-networkd.service
+
+After=attach-static-vdis.service
+After=forkexecd.service
+After=genptoken.service
+After=message-switch.service
+After=save-boot-info.service
+After=syslog.target
+After=time-sync.target
+After=v6d.service
+After=xapi-storage-script.service
+After=xcp-networkd.service
+After=xcp-networkd.service
+After=xcp-rrdd.service
+After=xenopsd-xc.service
+After=xenstored.service
+
 Conflicts=shutdown.target
 
 [Service]

scripts/xapi.service

@@ -194,7 +194,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/cron.daily/license-check
 @OPTDIR@/libexec/legacy-management-interface
 @OPTDIR@/libexec/xapi-init
-/etc/init.d/xapi
 @OPTDIR@/libexec/xapissl
 @OPTDIR@/libexec/attach-static-vdis
 @OPTDIR@/libexec/save-boot-info