[pve-devel] [PATCH zfsonlinux 0/3] update to ZFS 2.0.2

[pve-devel] [PATCH zfsonlinux 0/3] update to ZFS 2.0.2

[Stoiko Ivanov]

ZFS 2.0.2 got released recently.
This patchset updates the submodule to the new tag, and adds 2 patches from
salsa.d.o:
* zgenhostid got moved from /usr/bin/ to /sbin
* the arcstat manpage got moved to section 8 (to avoid conflicting with
  another package
The first commit is necessary, I added the other one to keep closer to debian
upstream.

I built a test kernel based on 5.4.86-1-pve (no changes needed there) and gave
it a quick spin on a virtual setup of mine.


Stoiko Ivanov (3):
  update submodule to zfs-2.0.0
  zgenhostid is installed in /sbin
  move manpage arcstat(1) to arcstat(8).

 ...-move-manpage-arcstat-1-to-arcstat-8.patch | 54 +++++++++++++++++++
 debian/patches/series                         |  1 +
 debian/zfsutils-linux.install                 |  4 +-
 upstream                                      |  2 +-
 4 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 1/3] update submodule to zfs-2.0.0

[Stoiko Ivanov]

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 upstream | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upstream b/upstream
index 32a78e57..d022406a 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit 32a78e579dd3395e122a451848cf88089f6b18ae
+Subproject commit d022406a1499279167362f9c36280e1f847204e2
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 2/3] zgenhostid is installed in /sbin

[Stoiko Ivanov]

Adapted from debian upstream [0] commits:
76f1cec519ce3bd126dbb3b9d63e3a76c1b7c89e

[0] https://salsa.debian.org/zfsonlinux-team/zfs/

Originally-By: Antonio Russo <aerusso@aerusso.net>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/zfsutils-linux.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 04f0fe48..8ca14859 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -21,11 +21,11 @@ sbin/mount.zfs
 sbin/zdb
 sbin/zfs
 sbin/zfs_ids_to_path
+sbin/zgenhostid
 sbin/zhack
 sbin/zpool
 sbin/zstream
 sbin/zstreamdump
-usr/bin/zgenhostid
 usr/bin/zvol_wait
 usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 3/3] move manpage arcstat(1) to arcstat(8).

[Stoiko Ivanov]

Adapted from debian upstream [0] commits:
1a3239e6b3b5604bb588c10912f57f32962b38c3
66b7241c965cdce730e76ca59c242fccc267b302

[0] https://salsa.debian.org/zfsonlinux-team/zfs/
Originally-By: Mo Zhou <cdluminate@gmail.com>
Originally-By: Antonio Russo <aerusso@aerusso.net>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 ...-move-manpage-arcstat-1-to-arcstat-8.patch | 54 +++++++++++++++++++
 debian/patches/series                         |  1 +
 debian/zfsutils-linux.install                 |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch

diff --git a/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
new file mode 100644
index 00000000..917a1815
--- /dev/null
+++ b/debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
@@ -0,0 +1,54 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stoiko Ivanov <s.ivanov@proxmox.com>
+Date: Thu, 4 Feb 2021 19:01:12 +0100
+Subject: [PATCH] Patch: move manpage arcstat(1) to arcstat(8).
+
+Originally-By: Mo Zhou <cdluminate@gmail.com>
+Originally-By: Antonio Russo <aerusso@aerusso.net>
+
+Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+---
+ man/man1/Makefile.am                   | 2 +-
+ man/man8/Makefile.am                   | 1 +
+ man/{man1/arcstat.1 => man8/arcstat.8} | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ rename man/{man1/arcstat.1 => man8/arcstat.8} (99%)
+
+diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
+index 8d7457a3e..101af7b6c 100644
+--- a/man/man1/Makefile.am
++++ b/man/man1/Makefile.am
+@@ -1,4 +1,4 @@
+-dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1 arcstat.1
++dist_man_MANS = zhack.1 ztest.1 raidz_test.1 zvol_wait.1
+ EXTRA_DIST = cstyle.1
+ 
+ if BUILD_LINUX
+diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am
+index 07f6aefa6..a757b1c62 100644
+--- a/man/man8/Makefile.am
++++ b/man/man8/Makefile.am
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/config/Substfiles.am
+ 
+ dist_man_MANS = \
++	arcstat.8 \
+ 	fsck.zfs.8 \
+ 	mount.zfs.8 \
+ 	vdev_id.8 \
+diff --git a/man/man1/arcstat.1 b/man/man8/arcstat.8
+similarity index 99%
+rename from man/man1/arcstat.1
+rename to man/man8/arcstat.8
+index ca508b49c..0aa81849a 100644
+--- a/man/man1/arcstat.1
++++ b/man/man8/arcstat.8
+@@ -13,7 +13,7 @@
+ .\" Copyright (c) 2015 by Delphix. All rights reserved.
+ .\" Copyright (c) 2020 by AJ Jordan. All rights reserved.
+ .\"
+-.TH ARCSTAT 1 "Oct 20, 2020" OpenZFS
++.TH ARCSTAT 8 "Oct 20, 2020" OpenZFS
+ .SH NAME
+ arcstat \- report ZFS ARC and L2ARC statistics
+ .SH SYNOPSIS
diff --git a/debian/patches/series b/debian/patches/series
index e1d7c485..91b8a3b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-dont-symlink-zed-scripts.patch
 0007-Use-installed-python3.patch
 0008-Add-systemd-unit-for-importing-specific-pools.patch
+0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 8ca14859..ccb1f169 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -33,7 +33,7 @@ usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 usr/share/bash-completion/completions
-usr/share/man/man1/arcstat.1
+usr/share/man/man8/arcstat.8
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
 usr/share/man/man5/
-- 
2.20.1

[pve-devel] applied-series: [PATCH zfsonlinux 0/3] update to ZFS 2.0.2

[Thomas Lamprecht]

On 04.02.21 20:09, Stoiko Ivanov wrote:
> ZFS 2.0.2 got released recently.
> This patchset updates the submodule to the new tag, and adds 2 patches from
> salsa.d.o:
> * zgenhostid got moved from /usr/bin/ to /sbin
> * the arcstat manpage got moved to section 8 (to avoid conflicting with
>   another package
> The first commit is necessary, I added the other one to keep closer to debian
> upstream.
> 
> I built a test kernel based on 5.4.86-1-pve (no changes needed there) and gave
> it a quick spin on a virtual setup of mine.
> 
> 
> Stoiko Ivanov (3):
>   update submodule to zfs-2.0.0
>   zgenhostid is installed in /sbin
>   move manpage arcstat(1) to arcstat(8).
> 
>  ...-move-manpage-arcstat-1-to-arcstat-8.patch | 54 +++++++++++++++++++
>  debian/patches/series                         |  1 +
>  debian/zfsutils-linux.install                 |  4 +-
>  upstream                                      |  2 +-
>  4 files changed, 58 insertions(+), 3 deletions(-)
>  create mode 100644 debian/patches/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch
> 

applied series, thanks!

fixed the commit message of the "update submodule" patch though, as we don't
go backwards in version ;)