c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c79374e7fb
zfsonlinux/debian/patches/0006-dont-symlink-zed-scripts.patch

31 lines
1.0 KiB
Diff
Raw Normal View History

add ident to zedlet-list creation patch the last series of cherry-picks from salsa.d.o includes one patch for the zfs-source, but the patch file does not contain ident-information. This prevents it from being applied by import-patchqueue. Fixed by adding ident based on the original patches commit message and importing and exporting the patchqueue. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-03-26 18:47:16 +03:00
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
(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])
[0] https://salsa.debian.org/zfsonlinux-team/zfs.git
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Preserve /etc/zfs/zed.d configuration on upgrade 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. (cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0]) [0] https://salsa.debian.org/zfsonlinux-team/zfs.git Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-03-20 19:28:43 +03:00
Description: track default symlinks, instead of symlinking
Forwarded: no need
add ident to zedlet-list creation patch the last series of cherry-picks from salsa.d.o includes one patch for the zfs-source, but the patch file does not contain ident-information. This prevents it from being applied by import-patchqueue. Fixed by adding ident based on the original patches commit message and importing and exporting the patchqueue. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-03-26 18:47:16 +03:00
---
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
update submodule and patches to ZFS 2.1.1-staging Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2021-09-27 21:07:04 +03:00
index 2c8173b3e..ad39292e4 100644
Preserve /etc/zfs/zed.d configuration on upgrade 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. (cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0]) [0] https://salsa.debian.org/zfsonlinux-team/zfs.git Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-03-20 19:28:43 +03:00
--- a/cmd/zed/zed.d/Makefile.am
+++ b/cmd/zed/zed.d/Makefile.am
update submodule and patches to ZFS 2.1.1-staging Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2021-09-27 21:07:04 +03:00
@@ -49,7 +49,7 @@ install-data-hook:
Preserve /etc/zfs/zed.d configuration on upgrade 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. (cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0]) [0] https://salsa.debian.org/zfsonlinux-team/zfs.git Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-03-20 19:28:43 +03:00
for f in $(zedconfdefaults); do \
test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
-L "$(DESTDIR)$(zedconfdir)/$${f}" || \
- ln -s "$(zedexecdir)/$${f}" "$(DESTDIR)$(zedconfdir)"; \
+ echo "$${f}" >> "$(DESTDIR)$(zedexecdir)/DEFAULT-ENABLED" ; \
done
chmod 0600 "$(DESTDIR)$(zedconfdir)/zed.rc"
update submodule and patches to ZFS 2.1.1-staging Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2021-09-27 21:07:04 +03:00
Reference in New Issue Copy Permalink