]> git.proxmox.com Git - zfsonlinux.git/blob - debian/patches/0013-etc-mask-zfs-load-key.service.patch
cherry-pick a few patches from zfs-2.1.7-staging
[zfsonlinux.git] / debian / patches / 0013-etc-mask-zfs-load-key.service.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
3 Date: Thu, 13 Oct 2022 00:29:21 +0200
4 Subject: [PATCH] etc: mask zfs-load-key.service
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 Otherwise, systemd-sysv-generator will generate a service equivalent
10 that breaks the boot: under systemd this is covered by
11 zfs-mount-generator
12
13 We already do this for zfs-import.service, and other init scripts are
14 suppressed automatically by the "actual" .service files
15
16 Fixes: commit f04b97620059d08b37d9e80ada397e742bb2f311 ("Add init script
17 to load keys")
18 Reviewed-by: George Melikov <mail@gmelikov.ru>
19 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
20 Signed-off-by: Ahelenia ZiemiaƄska <nabijaczleweli@nabijaczleweli.xyz>
21 Closes #14010
22 Closes #14019
23 (cherry picked from commit 8cf59e97c4fc7b70723313953ceb0f777ca3bcdf)
24 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
25 ---
26 etc/systemd/system/Makefile.am | 1 +
27 1 file changed, 1 insertion(+)
28
29 diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
30 index 8e6baeb68..af3ae597c 100644
31 --- a/etc/systemd/system/Makefile.am
32 +++ b/etc/systemd/system/Makefile.am
33 @@ -23,3 +23,4 @@ SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA)
34 install-data-hook:
35 $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
36 ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
37 + ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-load-key.service"