diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-25 02:03:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-25 02:03:50 +0000 |
| commit | 426aa983e40197a69c600c42e0679b2161ca225c (patch) | |
| tree | 0d279fe549a8f3cc4b684897eaf275d91c8411fe /sys-fs/zfs/files | |
| parent | ec9f79e1d3358df31a704f16a76a269ccceae2b2 (diff) | |
gentoo auto-resync : 25:12:2022 - 02:03:49
Diffstat (limited to 'sys-fs/zfs/files')
| -rw-r--r-- | sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch | 44 | ||||
| -rw-r--r-- | sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch | 27 |
2 files changed, 71 insertions, 0 deletions
diff --git a/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch b/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch new file mode 100644 index 000000000000..2a50dc658876 --- /dev/null +++ b/sys-fs/zfs/files/2.1.7-dracut-include-systemd-overrides.patch @@ -0,0 +1,44 @@ +From b10f73f78eb223dd799a87474c537a69113edee1 Mon Sep 17 00:00:00 2001 +From: Vince van Oosten <techhazard@codeforyouand.me> +Date: Sun, 23 Oct 2022 10:55:46 +0200 +Subject: [PATCH] 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 <behlendorf1@llnl.gov> +Signed-off-by: Vince van Oosten <techhazard@codeforyouand.me> +Closes #14075 +Closes #14076 +--- + contrib/dracut/90zfs/module-setup.sh.in | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in +index 81d7d2abe49..b16529de905 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 \ diff --git a/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch b/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch new file mode 100644 index 000000000000..2d4b92d5c66a --- /dev/null +++ b/sys-fs/zfs/files/2.1.7-systemd-zed-restart-always.patch @@ -0,0 +1,27 @@ +From f505cd53fd9cb6e6efb1e23a9d77e38bba754695 Mon Sep 17 00:00:00 2001 +From: George Melikov <mail@gmelikov.ru> +Date: Fri, 16 Dec 2022 01:11:02 +0300 +Subject: [PATCH] systemd: set restart=always for zfs-zed.service +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: George Melikov <mail@gmelikov.ru> +Co-authored-by: Attila Fülöp <attila@fueloep.org> +--- + etc/systemd/system/zfs-zed.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in +index 73a83e59e51..be2fc67348f 100644 +--- a/etc/systemd/system/zfs-zed.service.in ++++ b/etc/systemd/system/zfs-zed.service.in +@@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/module/zfs + [Service] + EnvironmentFile=-@initconfdir@/zfs + ExecStart=@sbindir@/zed -F +-Restart=on-abort ++Restart=always + + [Install] + Alias=zed.service |