diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index fd822989da93..6d9a065e7e3a 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -1,21 +1,21 @@ [Unit] Description=Import ZFS pools by cache file Documentation=man:zpool(8) DefaultDependencies=no Requires=systemd-udev-settle.service After=systemd-udev-settle.service After=cryptsetup.target After=multipathd.service After=systemd-remount-fs.service Before=zfs-import.target ConditionFileNotEmpty=@sysconfdir@/zfs/zpool.cache ConditionPathIsDirectory=/sys/module/zfs [Service] 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 c5dd45d87e68..fb524f3b0889 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -1,20 +1,20 @@ [Unit] Description=Import ZFS pools by device scanning Documentation=man:zpool(8) DefaultDependencies=no Requires=systemd-udev-settle.service After=systemd-udev-settle.service After=cryptsetup.target After=multipathd.service Before=zfs-import.target ConditionFileNotEmpty=!@sysconfdir@/zfs/zpool.cache ConditionPathIsDirectory=/sys/module/zfs [Service] 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 66d894923f4a..fc4e1c49f1c5 100644 --- a/etc/systemd/system/zfs-mount.service.in +++ b/etc/systemd/system/zfs-mount.service.in @@ -1,18 +1,18 @@ [Unit] Description=Mount ZFS filesystems Documentation=man:zfs(8) DefaultDependencies=no After=systemd-udev-settle.service After=zfs-import.target After=systemd-remount-fs.service Before=local-fs.target ConditionPathIsDirectory=/sys/module/zfs [Service] 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/zfs-scrub@.service.in b/etc/systemd/system/zfs-scrub@.service.in index 8ffffeb0cf6c..2bb2757d5e97 100644 --- a/etc/systemd/system/zfs-scrub@.service.in +++ b/etc/systemd/system/zfs-scrub@.service.in @@ -1,15 +1,15 @@ [Unit] Description=zpool scrub on %i Documentation=man:zpool-scrub(8) Requires=zfs.target After=zfs.target ConditionACPower=true 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 1a6342a06fec..dd321f490fe6 100644 --- a/etc/systemd/system/zfs-share.service.in +++ b/etc/systemd/system/zfs-share.service.in @@ -1,20 +1,20 @@ [Unit] Description=ZFS file system shares Documentation=man:zfs(8) Before=nfs-server.service nfs-kernel-server.service After=smb.service Before=rpc-statd-notify.service Wants=zfs-mount.service After=zfs-mount.service PartOf=nfs-server.service nfs-kernel-server.service PartOf=smb.service ConditionPathIsDirectory=/sys/module/zfs [Service] 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/zfs-trim@.service.in b/etc/systemd/system/zfs-trim@.service.in index 423fb448c16f..f55e36cd8454 100644 --- a/etc/systemd/system/zfs-trim@.service.in +++ b/etc/systemd/system/zfs-trim@.service.in @@ -1,15 +1,15 @@ [Unit] Description=zpool trim on %i Documentation=man:zpool-trim(8) Requires=zfs.target After=zfs.target ConditionACPower=true 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 110c0f5f52ee..a86a3561e032 100644 --- a/etc/systemd/system/zfs-volume-wait.service.in +++ b/etc/systemd/system/zfs-volume-wait.service.in @@ -1,15 +1,15 @@ [Unit] Description=Wait for ZFS Volume (zvol) links in /dev DefaultDependencies=no After=systemd-udev-settle.service After=zfs-import.target ConditionPathIsDirectory=/sys/module/zfs [Service] 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 be2fc67348f9..ac58ad3eff7b 100644 --- a/etc/systemd/system/zfs-zed.service.in +++ b/etc/systemd/system/zfs-zed.service.in @@ -1,13 +1,13 @@ [Unit] Description=ZFS Event Daemon (zed) Documentation=man:zed(8) ConditionPathIsDirectory=/sys/module/zfs [Service] EnvironmentFile=-@initconfdir@/zfs -ExecStart=@sbindir@/zed -F +ExecStart=zed -F Restart=always [Install] Alias=zed.service WantedBy=zfs.target