From c40521f90e7514c01584848a5a1827aac1f8fdbe Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 28 Sep 2023 12:37:27 +0200 Subject: [PATCH] update zfs submodule to 2.1.13 and refresh patches Sugested-by: Thomas Lamprecht Signed-off-by: Stoiko Ivanov Signed-off-by: Thomas Lamprecht (cherry picked from commit 362d3432be5f5ed815a980194f98b4ecb7f636b9) Signed-off-by: Thomas Lamprecht --- debian/patches/0005-Enable-zed-emails.patch | 2 +- debian/patches/0006-dont-symlink-zed-scripts.patch | 4 ++-- upstream | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch index d87df00..ef260eb 100644 --- a/debian/patches/0005-Enable-zed-emails.patch +++ b/debian/patches/0005-Enable-zed-emails.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc -index 227b26c26..240d0dbfa 100644 +index 1dfd43454..0180dd827 100644 --- a/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc @@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root" diff --git a/debian/patches/0006-dont-symlink-zed-scripts.patch b/debian/patches/0006-dont-symlink-zed-scripts.patch index 33c066b..82e761c 100644 --- a/debian/patches/0006-dont-symlink-zed-scripts.patch +++ b/debian/patches/0006-dont-symlink-zed-scripts.patch @@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am -index 2c8173b3e..ad39292e4 100644 +index 1905a9207..6dc06252a 100644 --- a/cmd/zed/zed.d/Makefile.am +++ b/cmd/zed/zed.d/Makefile.am -@@ -49,7 +49,7 @@ install-data-hook: +@@ -51,7 +51,7 @@ install-data-hook: for f in $(zedconfdefaults); do \ test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \ -L "$(DESTDIR)$(zedconfdir)/$${f}" || \ diff --git a/upstream b/upstream index 86783d7..eb62221 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 86783d7d92cf7a859464719a917fdff845b9a9e1 +Subproject commit eb62221ff0f9efbc2ab826ec6f1388c5f05fb664