8 files changed, 16 insertions, 16 deletions
diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in
index fd822989d..6d9a065e7 100644
--- a/etc/systemd/system/zfs-import-cache.service.in
+++ b/etc/systemd/system/zfs-import-cache.service.in
@@ -15,7 +15,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-@initconfdir@/zfs
-ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN $ZPOOL_IMPORT_OPTS
+ExecStart=zpool import -c @sysconfdir@/zfs/zpool.cache -aN $ZPOOL_IMPORT_OPTS
 
 [Install]
 WantedBy=zfs-import.target
diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
index c5dd45d87..fb524f3b0 100644
--- a/etc/systemd/system/zfs-import-scan.service.in
+++ b/etc/systemd/system/zfs-import-scan.service.in
@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-@initconfdir@/zfs
-ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
+ExecStart=zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
 
 [Install]
 WantedBy=zfs-import.target
diff --git a/etc/systemd/system/zfs-mount.service.in b/etc/systemd/system/zfs-mount.service.in
index 66d894923..fc4e1c49f 100644
--- a/etc/systemd/system/zfs-mount.service.in
+++ b/etc/systemd/system/zfs-mount.service.in
@@ -12,7 +12,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-@initconfdir@/zfs
-ExecStart=@sbindir@/zfs mount -a
+ExecStart=zfs mount -a
 
 [Install]
 WantedBy=zfs.target
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'
diff --git a/etc/systemd/system/zfs-share.service.in b/etc/systemd/system/zfs-share.service.in
index 1a6342a06..dd321f490 100644
--- a/etc/systemd/system/zfs-share.service.in
+++ b/etc/systemd/system/zfs-share.service.in
@@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-@initconfdir@/zfs
-ExecStart=@sbindir@/zfs share -a
+ExecStart=zfs share -a
 
 [Install]
 WantedBy=zfs.target
diff --git a/etc/systemd/system/[email protected] b/etc/systemd/system/[email protected]
index 423fb448c..f55e36cd8 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 "(trimming)"; then\
-exec @sbindir@/zpool wait -t trim %i;\
-else exec @sbindir@/zpool trim -w %i; fi'
-ExecStop=-/bin/sh -c '@sbindir@/zpool trim -s %i 2>/dev/null || true'
+ExecStart=sh -c '\
+if zpool status %i | grep -q "(trimming)"; then\
+exec zpool wait -t trim %i;\
+else exec zpool trim -w %i; fi'
+ExecStop=-sh -c 'zpool trim -s %i 2>/dev/null || true'
diff --git a/etc/systemd/system/zfs-volume-wait.service.in b/etc/systemd/system/zfs-volume-wait.service.in
index 110c0f5f5..a86a3561e 100644
--- a/etc/systemd/system/zfs-volume-wait.service.in
+++ b/etc/systemd/system/zfs-volume-wait.service.in
@@ -9,7 +9,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-@initconfdir@/zfs
-ExecStart=@bindir@/zvol_wait
+ExecStart=zvol_wait
 
 [Install]
 WantedBy=zfs-volumes.target
diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
index be2fc6734..ac58ad3ef 100644
--- a/etc/systemd/system/zfs-zed.service.in
+++ b/etc/systemd/system/zfs-zed.service.in
@@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
 
 [Service]
 EnvironmentFile=-@initconfdir@/zfs
-ExecStart=@sbindir@/zed -F
+ExecStart=zed -F
 Restart=always
 
 [Install]