diff options
| author | Vince van Oosten <[email protected]> | 2022-10-23 11:11:18 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-11-01 12:23:51 -0700 |
| commit | 59ca6e2ad0b40a67d83cddae8e33d95e8957ad06 (patch) | |
| tree | 9e84b83a91f91114ea5d400902251a7c70615710 /contrib | |
| parent | b10f73f78eb223dd799a87474c537a69113edee1 (diff) | |
include overrides for zfs-import.target
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Vince van Oosten <[email protected]>
Closes #14075
Closes #14076
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/dracut/90zfs/module-setup.sh.in | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index b16529de9..6be718587 100755 --- a/contrib/dracut/90zfs/module-setup.sh.in +++ b/contrib/dracut/90zfs/module-setup.sh.in @@ -81,15 +81,24 @@ install() { inst_simple "${moddir}/zfs-env-bootfs.service" "${systemdsystemunitdir}/zfs-env-bootfs.service" systemctl -q --root "${initdir}" add-wants zfs-import.target zfs-env-bootfs.service + # Add user-provided unit overrides: + # - /etc/systemd/system/${_service} + # - /etc/systemd/system/${_service}.d/overrides.conf + # -H ensures they are marked host-only + # -o ensures there is no error upon absence of these files + inst_multiple -o -H \ + "${systemdsystemconfdir}/zfs-import.target" \ + "${systemdsystemconfdir}/zfs-import.target.d/"*.conf + for _service in \ "zfs-import-scan.service" \ "zfs-import-cache.service"; do inst_simple "${systemdsystemunitdir}/${_service}" systemctl -q --root "${initdir}" add-wants zfs-import.target "${_service}" - # Add user-provided unit overrides - # - /etc/systemd/system/zfs-import-{scan,cache}.service - # - /etc/systemd/system/zfs-import-{scan,cache}.service.d/overrides.conf + # Add user-provided unit overrides: + # - /etc/systemd/system/${_service} + # - /etc/systemd/system/${_service}.d/overrides.conf # -H ensures they are marked host-only # -o ensures there is no error upon absence of these files inst_multiple -o -H \ |