- The xencommons.service file handles the starting of xenstored

and xenconsoled.  Drop the following services files as
  unecessary. Update xendomains.service to reflect these changes.
  xenstored.service 
  xenconsoled.service
  blktapctrl.service

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=265

blktapctrl.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=blktapctrl daemon
-RefuseManualStop=true
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=forking
-Environment=BLKTAPCTRL_ARGS=
-EnvironmentFile=-/etc/sysconfig/blktapctrl
-ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-
-[Install]
-WantedBy=multi-user.target

xen.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Aug 16 14:54:53 MDT 2013 - carnold@suse.com
+
+- The xencommons.service file handles the starting of xenstored
+  and xenconsoled.  Drop the following services files as
+  unecessary. Update xendomains.service to reflect these changes.
+  xenstored.service 
+  xenconsoled.service
+  blktapctrl.service
+
 -------------------------------------------------------------------
 Thu Aug 16 08:54:04 MDT 2013 - carnold@suse.com
 

xen.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           xen
 ExclusiveArch:  %ix86 x86_64 %arm aarch64
 %define xvers 4.3
@@ -186,13 +185,10 @@ Source34:       init.pciback
 Source35:       sysconfig.pciback
 Source36:       xnloader.py
 # Systemd service files
-Source40:       xenstored.service
+Source40:       xend.service
-Source41:       blktapctrl.service
+Source41:       xencommons.service
-Source42:       xend.service
+Source42:       xendomains.service
-Source43:       xenconsoled.service
+Source43:       xen-watchdog.service
-Source44:       xen-watchdog.service
-Source45:       xendomains.service
-Source46:       xencommons.service
 Source99:       baselibs.conf
 # http://xenbits.xensource.com/ext/xenalyze
 Source20000:    xenalyze.hg.tar.bz2
@@ -767,13 +763,10 @@ mv $RPM_BUILD_ROOT/etc/udev/rules.d/xend.rules $RPM_BUILD_ROOT/etc/udev/rules.d/
 # Systemd
 %if %{?with_systemd}0
 mkdir -p %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE40} %{buildroot}%{_unitdir}/xenstored.service
+install -m 644 %{SOURCE40} %{buildroot}%{_unitdir}/xend.service
-install -m 644 %{SOURCE41} %{buildroot}%{_unitdir}/blktapctrl.service
+install -m 644 %{SOURCE41} %{buildroot}%{_unitdir}/xencommons.service
-install -m 644 %{SOURCE42} %{buildroot}%{_unitdir}/xend.service
+install -m 644 %{SOURCE42} %{buildroot}%{_unitdir}/xendomains.service
-install -m 644 %{SOURCE43} %{buildroot}%{_unitdir}/xenconsoled.service
+install -m 644 %{SOURCE43} %{buildroot}%{_unitdir}/xen-watchdog.service
-install -m 644 %{SOURCE44} %{buildroot}%{_unitdir}/xen-watchdog.service
-install -m 644 %{SOURCE45} %{buildroot}%{_unitdir}/xendomains.service
-install -m 644 %{SOURCE46} %{buildroot}%{_unitdir}/xencommons.service
 %endif
 
 # Xen utils
@@ -988,11 +981,8 @@ rm -f  $RPM_BUILD_ROOT/usr/libexec/qemu-bridge-helper
 %config /etc/init.d/pciback
 %endif
 %if %{?with_systemd}0
-%{_unitdir}/xendomains.service
 %{_unitdir}/xencommons.service
-%{_unitdir}/xenstored.service
+%{_unitdir}/xendomains.service
-%{_unitdir}/blktapctrl.service
-%{_unitdir}/xenconsoled.service
 %{_unitdir}/xen-watchdog.service
 %endif
 %dir /etc/modprobe.d

xenconsoled.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=Xenconsoled - handles logging from guest consoles and hypervisor
-After=xenstored.service
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=simple
-Environment=XENCONSOLED_ARGS=
-Environment=XENCONSOLED_LOG=none
-Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console
-EnvironmentFile=-/etc/sysconfig/xenconsoled
-PIDFile=/var/run/xenconsoled.pid
-ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS
-
-[Install]
-WantedBy=multi-user.target

xendomains.service

@@ -1,7 +1,6 @@
 [Unit]
 Description=Xendomains - start and stop Xen VMs on boot and shutdown
-Requires=xenstored.service xenconsoled.service
+After=xencommons.service network.target
-After=xencommons.service xenstored.service xenconsoled.service network.target
 ConditionPathExists=/proc/xen
 
 [Service]

xenstored.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=Xenstored - daemon managing xenstore file system
-Before=libvirtd.service libvirt-guests.service
-RefuseManualStop=true
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=forking
-Environment=XENSTORED_ARGS=
-EnvironmentFile=-/etc/sysconfig/xenstored
-PIDFile=/var/run/xenstored.pid
-ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS
-
-[Install]
-WantedBy=multi-user.target