From: NeilBrown Date: Thu, 28 Jan 2016 00:45:53 +0000 (+1100) Subject: systemd/mdadm-last-resort: add Conflicts to .service file. X-Git-Tag: mdadm-3.4~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cec72c071bbe;p=thirdparty%2Fmdadm.git 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 --- diff --git a/systemd/mdadm-last-resort@.service b/systemd/mdadm-last-resort@.service index 5179f194..e93d72b2 100644 --- 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