Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Revert "systemd: Use non-absolute paths in Exec* lines" 

This reverts commit 79b20949b2 since it
doesn't work with the systemd version shipped with RHEL7-based systems.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #14943
Closes #14945
This commit is contained in:
Rich Ercolani 2023-06-07 14:14:05 -04:00 committed by GitHub
parent 93f8abeff0
commit 6c96269024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/systemd/system/zfs-import-cache.service.in
View File

@ -15,7 +15,7 @@ ConditionPathIsDirectory=/sys/module/zfs
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-@initconfdir@/zfs
ExecStart=zpool import -c @sysconfdir@/zfs/zpool.cache -aN $ZPOOL_IMPORT_OPTS
ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN $ZPOOL_IMPORT_OPTS
[Install]
WantedBy=zfs-import.target

2
etc/systemd/system/zfs-import-scan.service.in
View File

@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-@initconfdir@/zfs
ExecStart=zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
ExecStart=@sbindir@/zpool import -aN -o cachefile=none $ZPOOL_IMPORT_OPTS
[Install]
WantedBy=zfs-import.target

2
etc/systemd/system/zfs-mount.service.in
View File

@ -12,7 +12,7 @@ ConditionPathIsDirectory=/sys/module/zfs
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-@initconfdir@/zfs
ExecStart=zfs mount -a
ExecStart=@sbindir@/zfs mount -a
[Install]
WantedBy=zfs.target

10
etc/systemd/system/zfs-scrub@.service.in
View File

@ -8,8 +8,8 @@ ConditionPathIsDirectory=/sys/module/zfs
[Service]
EnvironmentFile=-@initconfdir@/zfs
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'
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'

2
etc/systemd/system/zfs-share.service.in
View File

@ -14,7 +14,7 @@ ConditionPathIsDirectory=/sys/module/zfs
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-@initconfdir@/zfs
ExecStart=zfs share -a
ExecStart=@sbindir@/zfs share -a
[Install]
WantedBy=zfs.target

10
etc/systemd/system/zfs-trim@.service.in
View File

@ -8,8 +8,8 @@ ConditionPathIsDirectory=/sys/module/zfs
[Service]
EnvironmentFile=-@initconfdir@/zfs
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'
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'

2
etc/systemd/system/zfs-volume-wait.service.in
View File

@ -9,7 +9,7 @@ ConditionPathIsDirectory=/sys/module/zfs
Type=oneshot
RemainAfterExit=yes
EnvironmentFile=-@initconfdir@/zfs
ExecStart=zvol_wait
ExecStart=@bindir@/zvol_wait
[Install]
WantedBy=zfs-volumes.target

2
etc/systemd/system/zfs-zed.service.in
View File

@ -5,7 +5,7 @@ ConditionPathIsDirectory=/sys/module/zfs
[Service]
EnvironmentFile=-@initconfdir@/zfs
ExecStart=zed -F
ExecStart=@sbindir@/zed -F
Restart=always
[Install]