From e523ff743b5cc82a5a637f8f2121e1e67f84ea8a Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Feb 18 2012 23:10:44 +0000
Subject: move xen-watchdog to systemd


---

diff --git a/xen-watchdog.service b/xen-watchdog.service
new file mode 100644
index 0000000..9d0674c
--- /dev/null
+++ b/xen-watchdog.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Xen-watchdog - run xen watchdog daemon
+Requires=proc-xen.mount
+After=proc-xen.mount xend.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/xenwatchdogd 30 15
+KillSignal=USR1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/xen.spec b/xen.spec
index ccdb24f..2ebf3a3 100644
--- a/xen.spec
+++ b/xen.spec
@@ -15,7 +15,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.1.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -45,6 +45,7 @@ Source42: xenstored.service
 Source43: blktapctrl.service
 Source44: xend.service
 Source45: xenconsoled.service
+Source46: xen-watchdog.service
 
 Patch1: xen-initscript.patch
 Patch4: xen-dumpdir.patch
@@ -343,6 +344,7 @@ install -m 644 %{SOURCE42} %{buildroot}%{systemddir}/system/xenstored.service
 install -m 644 %{SOURCE43} %{buildroot}%{systemddir}/system/blktapctrl.service
 install -m 644 %{SOURCE44} %{buildroot}%{systemddir}/system/xend.service
 install -m 644 %{SOURCE45} %{buildroot}%{systemddir}/system/xenconsoled.service
+install -m 644 %{SOURCE46} %{buildroot}%{systemddir}/system/xen-watchdog.service
 
 # config file only used for hotplug, Fedora uses udev instead
 rm -f %{buildroot}/%{_sysconfdir}/sysconfig/xend
@@ -491,6 +493,7 @@ rm -rf %{buildroot}
 %{systemddir}/system/xenstored.service
 %{systemddir}/system/blktapctrl.service
 %{systemddir}/system/xenconsoled.service
+%{systemddir}/system/xen-watchdog.service
 
 %config(noreplace) %{_sysconfdir}/sysconfig/xenstored
 %config(noreplace) %{_sysconfdir}/sysconfig/xenconsoled
@@ -643,6 +646,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Feb 18 2012 Michael Young <m.a.young@durham.ac.uk> - 4.1.2-9
+- move xen-watchdog to systemd
+
 * Wed Feb 08 2012 Michael Young <m.a.young@durham.ac.uk> - 4.1.2-8
 - relocate systemd files for fc17+