[xen] adjust systemd service files not to report failures when running without a hypervisor or when xendom
myoung
myoung at fedoraproject.org
Sun Jul 22 19:55:39 UTC 2012
commit 891a16300dde2af0e74f40ae11dae5beb1db3e5d
Author: Michael Young <m.a.young at durham.ac.uk>
Date: Sun Jul 22 20:54:29 2012 +0100
adjust systemd service files not to report failures when running
without a hypervisor or when xendomains doesn't find anything to start
blktapctrl.service | 1 +
xen-watchdog.service | 1 +
xen.spec | 6 +++++-
xenconsoled.service | 1 +
xend.service | 1 +
xendomains.service | 3 ++-
xenstored.service | 1 +
7 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/blktapctrl.service b/blktapctrl.service
index 787053c..b5c7c2c 100644
--- a/blktapctrl.service
+++ b/blktapctrl.service
@@ -3,6 +3,7 @@ Description=blktapctrl daemon
Requires=proc-xen.mount
After=proc-xen.mount
RefuseManualStop=true
+ConditionPathExists=/proc/xen
[Service]
Type=forking
diff --git a/xen-watchdog.service b/xen-watchdog.service
index 9d0674c..8fd225a 100644
--- a/xen-watchdog.service
+++ b/xen-watchdog.service
@@ -2,6 +2,7 @@
Description=Xen-watchdog - run xen watchdog daemon
Requires=proc-xen.mount
After=proc-xen.mount xend.service
+ConditionPathExists=/proc/xen
[Service]
Type=forking
diff --git a/xen.spec b/xen.spec
index 1cef58d..36ff265 100644
--- a/xen.spec
+++ b/xen.spec
@@ -20,7 +20,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 4.1.2
-Release: 21%{?dist}
+Release: 22%{?dist}
Group: Development/Libraries
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
@@ -713,6 +713,10 @@ rm -rf %{buildroot}
%endif
%changelog
+* Sun Jul 22 2012 Michael Young <m.a.young at durham.ac.uk> - 4.1.2-22
+- adjust systemd service files not to report failures when running without
+ a hypervisor or when xendomains.service doesn't find anything to start
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/xenconsoled.service b/xenconsoled.service
index cd3482a..4c5429f 100644
--- a/xenconsoled.service
+++ b/xenconsoled.service
@@ -2,6 +2,7 @@
Description=Xenconsoled - handles logging from guest consoles and hypervisor
Requires=proc-xen.mount
After=proc-xen.mount xenstored.service
+ConditionPathExists=/proc/xen
[Service]
Type=simple
diff --git a/xend.service b/xend.service
index e74be2a..c9abb9f 100644
--- a/xend.service
+++ b/xend.service
@@ -3,6 +3,7 @@ Description=Xend - interface between hypervisor and some applications
Requires=proc-xen.mount
After=proc-xen.mount
Before=libvirtd.service libvirt-guests.service
+ConditionPathExists=/proc/xen
[Service]
Type=forking
diff --git a/xendomains.service b/xendomains.service
index d0d0e6c..0bd72d7 100644
--- a/xendomains.service
+++ b/xendomains.service
@@ -2,12 +2,13 @@
Description=Xendomains - start and stop guests on boot and shutdown
Requires=proc-xen.mount xenstored.service
After=proc-xen.mount xenstored.service xenconsoled.service
+ConditionPathExists=/proc/xen
[Service]
Type=oneshot
RemainAfterExit=true
ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/libexec/xendomains start
+ExecStart=-/usr/libexec/xendomains start
ExecStop=/usr/libexec/xendomains stop
[Install]
diff --git a/xenstored.service b/xenstored.service
index 5bfb47e..59b640a 100644
--- a/xenstored.service
+++ b/xenstored.service
@@ -4,6 +4,7 @@ Requires=proc-xen.mount var-lib-xenstored.mount
After=proc-xen.mount var-lib-xenstored.mount
Before=libvirtd.service libvirt-guests.service
RefuseManualStop=true
+ConditionPathExists=/proc/xen
[Service]
Type=forking
More information about the scm-commits
mailing list