diff options
| author | Dimitri John Ledkov <[email protected]> | 2023-05-24 20:31:28 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-05-24 12:31:28 -0700 |
| commit | 79b20949b25c8db4d379f6486b0835a6613b480c (patch) | |
| tree | 9f8a91362d2f5c9f1a80be31abbad3c76b1c39a8 /etc/systemd/system/[email protected] | |
| parent | 9d618615d1ede4dd40a69386bc300580550fd4d0 (diff) | |
systemd: Use non-absolute paths in Exec* lines
Since systemd v239, Exec* binaries are resolved from PATH when they
are not-absolute. Switch to this by default for ease of downstream
maintenance. Many downstream distributions move individual binaries
to locations that existing compile-time configurations cannot
accommodate.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Dimitri John Ledkov <[email protected]>
Closes #14880
Diffstat (limited to 'etc/systemd/system/[email protected]')
| -rw-r--r-- | etc/systemd/system/[email protected] | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/systemd/system/[email protected] b/etc/systemd/system/[email protected] index 8ffffeb0c..2bb2757d5 100644 --- a/etc/systemd/system/[email protected] +++ b/etc/systemd/system/[email protected] @@ -8,8 +8,8 @@ ConditionPathIsDirectory=/sys/module/zfs [Service] EnvironmentFile=-@initconfdir@/zfs -ExecStart=/bin/sh -c '\ -if @sbindir@/zpool status %i | grep -q "scrub in progress"; then\ -exec @sbindir@/zpool wait -t scrub %i;\ -else exec @sbindir@/zpool scrub -w %i; fi' -ExecStop=-/bin/sh -c '@sbindir@/zpool scrub -p %i 2>/dev/null || true' +ExecStart=sh -c '\ +if zpool status %i | grep -q "scrub in progress"; then\ +exec zpool wait -t scrub %i;\ +else exec zpool scrub -w %i; fi' +ExecStop=-sh -c 'zpool scrub -p %i 2>/dev/null || true' |