summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'systemd')
-rw-r--r--systemd/mdadm-last-resort@.service1
-rw-r--r--systemd/mdmonitor.service5
2 files changed, 2 insertions, 4 deletions
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
diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service
index c7cff3e4..9aff2f56 100644
--- a/systemd/mdmonitor.service
+++ b/systemd/mdmonitor.service
@@ -10,7 +10,4 @@ Description=MD array monitor
DefaultDependencies=no
[Service]
-Environment= MDADM_MONITOR_ARGS=--scan
-EnvironmentFile=-/run/sysconfig/mdadm
-ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh
-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
+ExecStart=BINDIR/mdadm --monitor --scan