c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update submodule and patches to ZFS

Browse Source 
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2022-06-24 14:55:50 +02:00 committed by Thomas Lamprecht
parent 75a1232bf6
commit b530052969
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/0005-Enable-zed-emails.patch vendored
View File

@ -13,10 +13,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
index 9ac77f929..672617f54 100644 index 227b26c26..240d0dbfa 100644
--- a/cmd/zed/zed.d/zed.rc --- a/cmd/zed/zed.d/zed.rc
+++ b/cmd/zed/zed.d/zed.rc +++ b/cmd/zed/zed.d/zed.rc
@@ -41,7 +41,7 @@ ZED_EMAIL_ADDR="root" @@ -42,7 +42,7 @@ ZED_EMAIL_ADDR="root"
## ##
# Minimum number of seconds between notifications for a similar event. # Minimum number of seconds between notifications for a similar event.
# #

4
debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch vendored
View File

@ -14,7 +14,7 @@ Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
rename man/{man1/arcstat.1 => man8/arcstat.8} (99%) rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
diff --git a/man/Makefile.am b/man/Makefile.am diff --git a/man/Makefile.am b/man/Makefile.am
index 8ab1b7572..8b3dbe633 100644 index 64650c2b9..95a66a62f 100644
--- a/man/Makefile.am --- a/man/Makefile.am
+++ b/man/Makefile.am +++ b/man/Makefile.am
@@ -8,7 +8,6 @@ dist_man_MANS = \ @@ -8,7 +8,6 @@ dist_man_MANS = \
@ -25,7 +25,7 @@ index 8ab1b7572..8b3dbe633 100644
\ \
man5/vdev_id.conf.5 \ man5/vdev_id.conf.5 \
\ \
@@ -21,6 +20,7 @@ dist_man_MANS = \ @@ -22,6 +21,7 @@ dist_man_MANS = \
man7/zpoolconcepts.7 \ man7/zpoolconcepts.7 \
man7/zpoolprops.7 \ man7/zpoolprops.7 \
\ \

2
upstream

@ -1 +1 @@
Subproject commit 52bad4f23daaa5f827f802c8d05785a27b80275d Subproject commit 6c3c5fcfbe27d9193cd131753cc7e47ee2784621