From: NeilBrown <neilb@suse.de>
Date: Thu, 12 Dec 2013 02:20:32 +0000 (+1100)
Subject: mdamd-last-resort: add a Conflicts line to stop the timer.
X-Git-Tag: mdadm-3.3.1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d8213f29046c9b184f9cb4af87878f937e10a9;p=thirdparty%2Fmdadm.git

mdamd-last-resort: add a Conflicts line to stop the timer.

When the md device actually appears we want to stop the timer and not
bother with the mdadm-last-resort@.server.  In particular, running
that causes confusing messages and is in general best avoided.

Fortuantely this can simply be achieved with a Conflicts= line

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/systemd/mdadm-last-resort@.timer b/systemd/mdadm-last-resort@.timer
index 6a1cd568..52b3f227 100644
--- a/systemd/mdadm-last-resort@.timer
+++ b/systemd/mdadm-last-resort@.timer
@@ -1,6 +1,7 @@
 [Unit]
 Description=Timer to wait for more drives before activating degraded array.
 DefaultDependencies=no
+Conflicts=sys-devices-virtual-block-%i.device
 
 [Timer]
 OnActiveSec=30