systemd/mdadm-last-resort: add Conflicts to .service file.

It seems that having the Conflicts in the .timer file is not sufficient.
Sometimes it works, but if the timer gets requested after the conflicting
block device appears (or was it "before" ...) the timer is not aborted.

Having the Conflicts in both files seems to work reliably.

URL: https://bugzilla.suse.com/show_bug.cgi?id=853944
Signed-off-by: NeilBrown <neilb@suse.com>

diff --git a/systemd/mdadm-last-resort@.service b/systemd/mdadm-last-resort@.service
index 5179f194b79a9f1c91b0d20a6d39b19d377878fd..e93d72b2b45e4eca6ad8146b71fd31dff19f8c79 100644 (file)
--- a/systemd/mdadm-last-resort@.service
+++ b/systemd/mdadm-last-resort@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Activate md array even though degraded
 DefaultDependencies=no
+Conflicts=sys-devices-virtual-block-%i.device
 
 [Service]
 Type=oneshot