[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] tools/hotplug: don't install init.d scripts if SYSTEMD



When Xen is configured with --with-systemd currently both the systemd
init scripts as well as the traditional init.d scripts (e.g. xencommons)
are installed.

This causes issues to distros where old style init scripts are still
supported even when systemd is enabled, e.g. Yocto. The consequence is
that xenconsoled (and other daemons) are executed twice resulting in
errors at boot.

If --with-systemd don't install xencommons and the other sysvinit
scripts.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>


diff --git a/tools/hotplug/Linux/Makefile b/tools/hotplug/Linux/Makefile
index 0b1d111d7e..03ed00ca70 100644
--- a/tools/hotplug/Linux/Makefile
+++ b/tools/hotplug/Linux/Makefile
@@ -47,10 +47,12 @@ install-initd:
        $(INSTALL_DATA) init.d/sysconfig.xendomains 
$(DESTDIR)$(SYSCONFIG_DIR)/xendomains
        $(INSTALL_DATA) init.d/sysconfig.xencommons 
$(DESTDIR)$(SYSCONFIG_DIR)/xencommons
        $(INSTALL_PROG) xendomains $(DESTDIR)$(LIBEXEC_BIN)
+ifndef CONFIG_SYSTEMD
        $(INSTALL_PROG) init.d/xendomains $(DESTDIR)$(INITD_DIR)
        $(INSTALL_PROG) init.d/xencommons $(DESTDIR)$(INITD_DIR)
        $(INSTALL_PROG) init.d/xendriverdomain $(DESTDIR)$(INITD_DIR)
        $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR)
+endif
 
 .PHONY: uninstall-initd
 uninstall-initd:



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.