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 6a1cd56810004470bda090c7fa4f03239162c93a..52b3f227b05d47c49f862136f95472e47f1fd55f 100644 (file)
--- 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