6da885c3b1
Just copy over the existing commit message... Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Antonio Russo <antonio.e.russo@gmail.com>
|
|
Date: Fri, 20 Mar 2020 17:28:43 +0100
|
|
Subject: [PATCH] dont symlink zed scripts
|
|
|
|
Of the zedlet scripts shipped by upstream, a subset are enabled by
|
|
default, by creating symlinks in /etc/zfs/zed.d. These symlinks are
|
|
shipped in the zfs-zed package. dpkg, however, does not support
|
|
conffile handling of symlinks, and therefore any changes (removals) to
|
|
the symlinks are not preserved on package upgrade.
|
|
|
|
To address this policy violation, we:
|
|
|
|
1. During package build, create a list of enabled-by-default zedlets,
|
|
instead of creating symlinks.
|
|
2. On package removal, identify all enabled-by-default zedlets whose
|
|
symlinks do not exist (i.e., were removed by the user). This is done
|
|
by creating "whiteout" links to /dev/null in their place).
|
|
3. On package installation, create links to enabled-by-default zedlets
|
|
UNLESS there is already a file there (i.e., abort if there is a
|
|
whiteout link).
|
|
4. We also clean up broken symlinks to removed zedlets at package
|
|
postinst.
|
|
|
|
Description: track default symlinks, instead of symlinking
|
|
Forwarded: no need
|
|
(cherry picked from https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/5cee380324d7)
|
|
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
cmd/zed/zed.d/Makefile.am | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
|
|
index 812558cf6..f802cf140 100644
|
|
--- a/cmd/zed/zed.d/Makefile.am
|
|
+++ b/cmd/zed/zed.d/Makefile.am
|
|
@@ -48,7 +48,7 @@ zed-install-data-hook:
|
|
set -x; for f in $(zedconfdefaults); do \
|
|
[ -f "$(DESTDIR)$(zedconfdir)/$${f}" ] ||\
|
|
[ -L "$(DESTDIR)$(zedconfdir)/$${f}" ] || \
|
|
- $(LN_S) "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
|
|
+ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
|
|
done
|
|
|
|
SHELLCHECKSCRIPTS += $(dist_zedconf_DATA) $(dist_zedexec_SCRIPTS) $(nodist_zedexec_SCRIPTS)
|