diff --git a/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch index 46b03fd..869ef4d 100644 --- a/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch +++ b/debian/patches/zfs/0004-import-with-d-dev-disk-by-id-in-scan-service.patch @@ -14,15 +14,15 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in -index f0317e23e..9a5e9cb17 100644 +index c1111c73a..c5e12c2c6 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs [Service] Type=oneshot RemainAfterExit=yes --ExecStart=@sbindir@/zpool import -aN -o cachefile=none -+ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none +-ExecStart=@sbindir@/zpool import -aN -o cachefile=none ${ZPOOL_IMPORT_OPTS} ++ExecStart=@sbindir@/zpool import -aN -d /dev/disk/by-id -o cachefile=none ${ZPOOL_IMPORT_OPTS} [Install] WantedBy=zfs-import.target diff --git a/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch b/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch index 917a181..e210ac8 100644 --- a/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +++ b/debian/patches/zfs/0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch @@ -8,47 +8,29 @@ Originally-By: Antonio Russo Signed-off-by: Stoiko Ivanov --- - 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 +diff --git a/man/Makefile.am b/man/Makefile.am +index 8ab1b7572..5485076f9 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -8,7 +8,7 @@ dist_man_MANS = \ + man1/ztest.1 \ + man1/raidz_test.1 \ + man1/zvol_wait.1 \ +- man1/arcstat.1 \ ++ man8/arcstat.8 \ + \ + man5/vdev_id.conf.5 \ + \ +diff --git a/man/man1/arcstat.1 b/man/man1/arcstat.1 +index a69cd8937..dfe9c971b 100644 --- a/man/man1/arcstat.1 -+++ b/man/man8/arcstat.8 ++++ b/man/man1/arcstat.1 @@ -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 + .Dd May 26, 2021 +-.Dt ARCSTAT 1 ++.Dt ARCSTAT 8 + .Os + . + .Sh NAME diff --git a/zfs b/zfs index cb2e336..c3b60ed 160000 --- a/zfs +++ b/zfs @@ -1 +1 @@ -Subproject commit cb2e3360380ad465c2e5685941ae125b5cff463a +Subproject commit c3b60ededa6e6ce36a457a54451ca153c4c630dc