]> git.proxmox.com Git - zfsonlinux.git/blob - debian/patches/0006-dont-symlink-zed-scripts.patch
update submodule and patches for 2.2.0
[zfsonlinux.git] / debian / patches / 0006-dont-symlink-zed-scripts.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Antonio Russo <antonio.e.russo@gmail.com>
3 Date: Fri, 20 Mar 2020 17:28:43 +0100
4 Subject: [PATCH] dont symlink zed scripts
5
6 (cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
7
8 [0] https://salsa.debian.org/zfsonlinux-team/zfs.git
9
10 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
11
12 Description: track default symlinks, instead of symlinking
13 Forwarded: no need
14 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
15 ---
16 cmd/zed/zed.d/Makefile.am | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
20 index 812558cf6..f802cf140 100644
21 --- a/cmd/zed/zed.d/Makefile.am
22 +++ b/cmd/zed/zed.d/Makefile.am
23 @@ -48,7 +48,7 @@ zed-install-data-hook:
24 set -x; for f in $(zedconfdefaults); do \
25 [ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
26 [ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
27 - $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
28 + echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
29 done
30
31 SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)