diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-02-19 16:18:57 +0000 |
|---|---|---|
| committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-02-19 16:18:57 +0000 |
| commit | 7e15cddececa359fa92a1a58e4a0c360e13058c1 (patch) | |
| tree | a4ce38859718496770223da4c9fae331a6d39bb5 /systemd | |
| parent | 5df672d08eb77e64a0f5ed922d2904f418d1758e (diff) | |
New upstream release.
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/mdadm-last-resort@.service | 1 | ||||
| -rw-r--r-- | systemd/mdmonitor.service | 5 |
2 files changed, 5 insertions, 1 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 9aff2f56..c7cff3e4 100644 --- a/systemd/mdmonitor.service +++ b/systemd/mdmonitor.service @@ -10,4 +10,7 @@ Description=MD array monitor DefaultDependencies=no [Service] -ExecStart=BINDIR/mdadm --monitor --scan +Environment= MDADM_MONITOR_ARGS=--scan +EnvironmentFile=-/run/sysconfig/mdadm +ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh +ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS |