[pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge

[Stoiko Ivanov]

This patchset updates ZFS to 2.2.5 which was released two weeks ago [0]
The changes don't look too scary, but could prevent a few issues in not so
common use-cases for us e.g.:
https://github.com/openzfs/zfs/pull/16359/commits/4d2f7f9839d12708417457cd57cf43d15cae5e92
https://github.com/openzfs/zfs/pull/16359/commits/6f27c4cadd29eb9b850c1c66bf71ef9ba119b955
https://github.com/openzfs/zfs/pull/16359/commits/ef08cb26dae6b3c2e930e66852f13329babb7c2e

Additionally I checked Debian's zfs repository [1], and pulled in the changes
done there.
Most prominently this is opt-in to usrmerge.
We could address the conflict of arcstat (a different executable is also
called arcstat in `nordugrid-arc-client`  (a grid middleware project,
which is rather unlikely to be co-installed on a machine running either of
our products)) differently (simply by conflicting with
nordugrid-arc-client, but I opted to stick close to upstream's packaging.
Similarly I'm not sure if we want to include the last patch (adding a NEWS
file for the usrmerge, notifying users prominently about the changed
paths), but included it as a RFC - feel free to drop it.

minimally tested on 2 VMs having a few containers with replication
configured. additionally installed a VM with ZFS on / and checked that the
usrmerge did not prevent it from booting.

[0] https://github.com/openzfs/zfs/pull/16359
[1] https://salsa.debian.org/zfsonlinux-team/zfs

Stoiko Ivanov (5):
  update zfs submodule to 2.2.5
  debian: remove libzfsbootenv1linux.install
  debian: install files to /usr
  d/zfsutils-linux.install: move most exectuables from sbin to bin
  d/NEWS: add news for usr-merge

 debian/NEWS                                   | 13 ++++
 debian/libnvpair3linux.install.in             |  2 +-
 debian/libpam-zfs.install                     |  2 -
 debian/libpam-zfs.install.in                  |  2 +
 debian/libuutil3linux.install.in              |  2 +-
 debian/libzfs4linux.install.in                |  4 +-
 debian/libzfsbootenv1linux.install            |  1 -
 debian/libzfsbootenv1linux.install.in         |  2 +-
 debian/libzfslinux-dev.install.in             |  6 +-
 debian/libzpool5linux.install.in              |  2 +-
 debian/rules                                  | 32 +++------
 .../usr/share/initramfs-tools/hooks/zdev      | 10 +--
 debian/zfs-test.install                       |  4 +-
 debian/zfs-zed.install                        |  2 +-
 debian/zfsutils-linux.install                 | 66 +++++++++----------
 debian/zfsutils-linux.links                   |  6 +-
 upstream                                      |  2 +-
 17 files changed, 79 insertions(+), 79 deletions(-)
 create mode 100644 debian/NEWS
 delete mode 100644 debian/libpam-zfs.install
 create mode 100644 debian/libpam-zfs.install.in
 delete mode 100644 debian/libzfsbootenv1linux.install

-- 
2.39.2