diff options
| author | NeilBrown <neilb@suse.de> | 2014-05-22 17:13:02 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2014-05-22 17:13:02 +1000 |
| commit | 85945e1986837e1e34247a03c99039593fbceb8b (patch) | |
| tree | 453d176c911ae229c7dc81b9cbc414187f3b54ee /systemd | |
| parent | df881f757b3d61e5dfc1a2b23436ab1cf5247157 (diff) | |
install: use BINDIR consistently to locate mdadm and mdmon
Every place where the paths for mdadm or mdmon is explicit,
it should use the BINDIR setting, not "/sbin/".
Reported-by: member graysky <graysky@archlinux.us> (https://bugs.archlinux.org/task/37330)
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/mdadm-grow-continue@.service | 2 | ||||
| -rw-r--r-- | systemd/mdadm-last-resort@.service | 2 | ||||
| -rw-r--r-- | systemd/mdadm.shutdown | 2 | ||||
| -rw-r--r-- | systemd/mdmon@.service | 2 | ||||
| -rw-r--r-- | systemd/mdmonitor.service | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/systemd/mdadm-grow-continue@.service b/systemd/mdadm-grow-continue@.service index 314a4fa0..5c667d2a 100644 --- a/systemd/mdadm-grow-continue@.service +++ b/systemd/mdadm-grow-continue@.service @@ -10,7 +10,7 @@ Description=Manage MD Reshape on /dev/%I DefaultDependencies=no [Service] -ExecStart=/sbin/mdadm --grow --continue /dev/%I +ExecStart=BINDIR/mdadm --grow --continue /dev/%I StandardInput=null StandardOutput=null StandardError=null diff --git a/systemd/mdadm-last-resort@.service b/systemd/mdadm-last-resort@.service index 45d3c2a1..5179f194 100644 --- a/systemd/mdadm-last-resort@.service +++ b/systemd/mdadm-last-resort@.service @@ -4,4 +4,4 @@ DefaultDependencies=no [Service] Type=oneshot -ExecStart=/sbin/mdadm --run /dev/%i +ExecStart=BINDIR/mdadm --run /dev/%i diff --git a/systemd/mdadm.shutdown b/systemd/mdadm.shutdown index 1bbbb6f8..33f27783 100644 --- a/systemd/mdadm.shutdown +++ b/systemd/mdadm.shutdown @@ -1,4 +1,4 @@ #!/bin/sh # We need to ensure all md arrays with external metadata # (e.g. IMSM, DDF) are clean before completing the shutdown. -/sbin/mdadm --wait-clean --scan +BINDIR/mdadm --wait-clean --scan diff --git a/systemd/mdmon@.service b/systemd/mdmon@.service index af0a2a33..85a3a7c5 100644 --- a/systemd/mdmon@.service +++ b/systemd/mdmon@.service @@ -19,7 +19,7 @@ Environment=IMSM_NO_PLATFORM=1 # 'takeover'. As the '--offroot --takeover' don't hurt when # not necessary, are are useful with root-on-md in dracut, # have them always present. -ExecStart=/sbin/mdmon --offroot --takeover %I +ExecStart=BINDIR/mdmon --offroot --takeover %I Type=forking # Don't set the PIDFile. It isn't necessary (systemd can work # it out) and systemd will remove it when transitioning from diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service index 11aaeff2..c7cff3e4 100644 --- a/systemd/mdmonitor.service +++ b/systemd/mdmonitor.service @@ -13,4 +13,4 @@ DefaultDependencies=no Environment= MDADM_MONITOR_ARGS=--scan EnvironmentFile=-/run/sysconfig/mdadm ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh -ExecStart=/sbin/mdadm --monitor $MDADM_MONITOR_ARGS +ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS |