mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
tools: remove systemd xenstore socket definitions
On a system with systemd the xenstore sockets are created via systemd. Remove the related configuration files in order to be able to decide at runtime whether the sockets should be created or not. This will enable Xen to start xenstore either via a daemon or via a stub domain. As the xenstore domain start program will exit after it has done its job prepare the same behaviour to be tolerated by systemd for the xenstore daemon by specifying the appropriate flags in the service file. A rerun of autogen.sh is required. Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Wei Liu <wei.liu2@citrix.com> Acked-by: David Scott <dave@recoil.org>
This commit is contained in:
Juergen Gross authored and 
Wei Liu committed
1 parent
97323702bf
commit
976ce01e10
12 files changed
+10
-255
No files matched your search
@@ -6,9 +6,6 @@ XEN_SYSTEMD_MODULES = xen.conf
|
||||
XEN_SYSTEMD_MOUNT = proc-xen.mount
|
||||
XEN_SYSTEMD_MOUNT += var-lib-xenstored.mount
|
||||
|
||||
XEN_SYSTEMD_SOCKET = xenstored.socket
|
||||
XEN_SYSTEMD_SOCKET += xenstored_ro.socket
|
||||
|
||||
XEN_SYSTEMD_SERVICE = xenstored.service
|
||||
XEN_SYSTEMD_SERVICE += xenconsoled.service
|
||||
XEN_SYSTEMD_SERVICE += xen-qemu-dom0-disk-backend.service
|
||||
@@ -19,7 +16,6 @@ XEN_SYSTEMD_SERVICE += xendriverdomain.service
|
||||
|
||||
ALL_XEN_SYSTEMD = $(XEN_SYSTEMD_MODULES) \
|
||||
$(XEN_SYSTEMD_MOUNT) \
|
||||
$(XEN_SYSTEMD_SOCKET) \
|
||||
$(XEN_SYSTEMD_SERVICE)
|
||||
|
||||
.PHONY: all
|
||||
@@ -38,7 +34,6 @@ install: $(ALL_XEN_SYSTEMD)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
[ -d $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD) ] || \
|
||||
$(INSTALL_DIR) $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)
|
||||
$(INSTALL_DATA) *.socket $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
$(INSTALL_DATA) *.service $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
$(INSTALL_DATA) *.mount $(DESTDIR)$(XEN_SYSTEMD_DIR)
|
||||
$(INSTALL_DATA) *.conf $(DESTDIR)$(XEN_SYSTEMD_MODULES_LOAD)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[Unit]
|
||||
Description=The Xen xenstore
|
||||
Requires=xenstored_ro.socket xenstored.socket proc-xen.mount var-lib-xenstored.mount
|
||||
Requires=proc-xen.mount var-lib-xenstored.mount
|
||||
After=proc-xen.mount var-lib-xenstored.mount
|
||||
Before=libvirtd.service libvirt-guests.service
|
||||
RefuseManualStop=true
|
||||
@@ -8,6 +8,8 @@ ConditionPathExists=/proc/xen/capabilities
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
NotifyAccess=all
|
||||
RemainAfterExit=true
|
||||
KillMode=none
|
||||
Environment=XENSTORED_ARGS=
|
||||
Environment=XENSTORED=@XENSTORED@
|
||||
@@ -19,6 +21,5 @@ ExecStart=/bin/sh -c "exec $XENSTORED --no-fork $XENSTORED_ARGS"
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Also=xenstored_ro.socket xenstored.socket
|
||||
Also=proc-xen.mount
|
||||
Also=var-lib-xenstored.mount
|
||||
@@ -1,13 +0,0 @@
|
||||
[Unit]
|
||||
Description=xenstore socket
|
||||
Requires=proc-xen.mount var-lib-xenstored.mount
|
||||
After=proc-xen.mount var-lib-xenstored.mount
|
||||
ConditionPathExists=/proc/xen/capabilities
|
||||
|
||||
[Socket]
|
||||
ListenStream=@XEN_RUN_STORED@/socket
|
||||
SocketMode=0600
|
||||
Service=xenstored.service
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
@@ -1,13 +0,0 @@
|
||||
[Unit]
|
||||
Description=xenstore ro socket
|
||||
Requires=proc-xen.mount var-lib-xenstored.mount
|
||||
After=proc-xen.mount var-lib-xenstored.mount
|
||||
ConditionPathExists=/proc/xen/capabilities
|
||||
|
||||
[Socket]
|
||||
ListenStream=@XEN_RUN_STORED@/socket_ro
|
||||
SocketMode=0660
|
||||
Service=xenstored.service
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||