diff options
| author | Vince van Oosten <[email protected]> | 2022-10-23 10:55:46 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-11-01 12:23:44 -0700 |
| commit | b10f73f78eb223dd799a87474c537a69113edee1 (patch) | |
| tree | 5924a4ef8a5235a9d4bf2a630783aebe367bf1c7 /contrib | |
| parent | 748b9d5bda935d126eeb62acab86c95e8b2ccac3 (diff) | |
include systemd overrides to zfs-dracut module
If a user that uses systemd and dracut wants to overide certain
settings, they typically use `systemctl edit [unit]` or place a file in
`/etc/systemd/system/[unit].d/override.conf` directly.
The zfs-dracut module did not include those overrides however, so this
did not have any effect at boot time.
For zfs-import-scan.service and zfs-import-cache.service, overrides are
now included in the dracut initramfs image.
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 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 81d7d2abe..b16529de9 100755 --- a/contrib/dracut/90zfs/module-setup.sh.in +++ b/contrib/dracut/90zfs/module-setup.sh.in @@ -86,6 +86,16 @@ install() { "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 + # -H ensures they are marked host-only + # -o ensures there is no error upon absence of these files + inst_multiple -o -H \ + "${systemdsystemconfdir}/${_service}" \ + "${systemdsystemconfdir}/${_service}.d/"*.conf + done for _service in \ |