* [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge
@ 2024-08-20 16:45 Stoiko Ivanov
2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 1/5] update zfs submodule to 2.2.5 Stoiko Ivanov
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Stoiko Ivanov @ 2024-08-20 16:45 UTC (permalink / raw)
To: pve-devel
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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 7+ messages in thread* [pve-devel] [PATCH zfsonlinux 1/5] update zfs submodule to 2.2.5 2024-08-20 16:45 [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge Stoiko Ivanov @ 2024-08-20 16:45 ` Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 2/5] debian: remove libzfsbootenv1linux.install Stoiko Ivanov ` (3 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Stoiko Ivanov @ 2024-08-20 16:45 UTC (permalink / raw) To: pve-devel patches did not need adaptation 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 25665920..33174af1 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 2566592045780e7be7afc899c2496b1ae3af4f4d +Subproject commit 33174af15112ed5c53299da2d28e763b0163f428 -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 2/5] debian: remove libzfsbootenv1linux.install 2024-08-20 16:45 [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 1/5] update zfs submodule to 2.2.5 Stoiko Ivanov @ 2024-08-20 16:45 ` Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 3/5] debian: install files to /usr Stoiko Ivanov ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Stoiko Ivanov @ 2024-08-20 16:45 UTC (permalink / raw) To: pve-devel When initially packaging libzfsbootenv1linux a .install file was commited in addtion to the .install.in (which contains the proper path with the multiarch component). This wasn't noticed during building because the .install got clobbered while building Fixes: fd0cc4becda91c46991e723ae6f0b08dcdf661e6 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- debian/libzfsbootenv1linux.install | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/libzfsbootenv1linux.install diff --git a/debian/libzfsbootenv1linux.install b/debian/libzfsbootenv1linux.install deleted file mode 100644 index 01d3f0c3..00000000 --- a/debian/libzfsbootenv1linux.install +++ /dev/null @@ -1 +0,0 @@ -lib/libzfsbootenv.so.* -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 3/5] debian: install files to /usr 2024-08-20 16:45 [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 1/5] update zfs submodule to 2.2.5 Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 2/5] debian: remove libzfsbootenv1linux.install Stoiko Ivanov @ 2024-08-20 16:45 ` Stoiko Ivanov 2024-09-03 9:32 ` Fabian Grünbichler 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 4/5] d/zfsutils-linux.install: move most exectuables from sbin to bin Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 5/5] d/NEWS: add news for usr-merge Stoiko Ivanov 4 siblings, 1 reply; 7+ messages in thread From: Stoiko Ivanov @ 2024-08-20 16:45 UTC (permalink / raw) To: pve-devel follows commit 902967808693510631a198414dc57dc4ca564afe in debian upstream [0], which was done to support usrmerge [0] https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- 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.in | 2 +- debian/libzfslinux-dev.install.in | 6 +- debian/libzpool5linux.install.in | 2 +- debian/rules | 26 +++----- .../usr/share/initramfs-tools/hooks/zdev | 10 ++-- debian/zfs-test.install | 4 +- debian/zfs-zed.install | 2 +- debian/zfsutils-linux.install | 60 +++++++++---------- debian/zfsutils-linux.links | 4 +- 14 files changed, 60 insertions(+), 68 deletions(-) delete mode 100644 debian/libpam-zfs.install create mode 100644 debian/libpam-zfs.install.in diff --git a/debian/libnvpair3linux.install.in b/debian/libnvpair3linux.install.in index ed7b541e..fce54227 100644 --- a/debian/libnvpair3linux.install.in +++ b/debian/libnvpair3linux.install.in @@ -1 +1 @@ -lib/@DEB_HOST_MULTIARCH@/libnvpair.so.* +usr/lib/@DEB_HOST_MULTIARCH@/libnvpair.so.* diff --git a/debian/libpam-zfs.install b/debian/libpam-zfs.install deleted file mode 100644 index c33123f6..00000000 --- a/debian/libpam-zfs.install +++ /dev/null @@ -1,2 +0,0 @@ -lib/*/security/pam_zfs_key.so -usr/share/pam-configs/zfs_key diff --git a/debian/libpam-zfs.install.in b/debian/libpam-zfs.install.in new file mode 100644 index 00000000..036b2e8b --- /dev/null +++ b/debian/libpam-zfs.install.in @@ -0,0 +1,2 @@ +usr/lib/@DEB_HOST_MULTIARCH@/security/pam_zfs_key.so +usr/share/pam-configs/zfs_key diff --git a/debian/libuutil3linux.install.in b/debian/libuutil3linux.install.in index a197d030..bb333867 100644 --- a/debian/libuutil3linux.install.in +++ b/debian/libuutil3linux.install.in @@ -1 +1 @@ -lib/@DEB_HOST_MULTIARCH@/libuutil.so.* +usr/lib/@DEB_HOST_MULTIARCH@/libuutil.so.* diff --git a/debian/libzfs4linux.install.in b/debian/libzfs4linux.install.in index 6765aaee..a9054c14 100644 --- a/debian/libzfs4linux.install.in +++ b/debian/libzfs4linux.install.in @@ -1,2 +1,2 @@ -lib/@DEB_HOST_MULTIARCH@/libzfs.so.* -lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.* +usr/lib/@DEB_HOST_MULTIARCH@/libzfs.so.* +usr/lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.* diff --git a/debian/libzfsbootenv1linux.install.in b/debian/libzfsbootenv1linux.install.in index 49216742..b61b8ab6 100644 --- a/debian/libzfsbootenv1linux.install.in +++ b/debian/libzfsbootenv1linux.install.in @@ -1 +1 @@ -lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.* +usr/lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.* diff --git a/debian/libzfslinux-dev.install.in b/debian/libzfslinux-dev.install.in index e515ddb8..7605b4db 100644 --- a/debian/libzfslinux-dev.install.in +++ b/debian/libzfslinux-dev.install.in @@ -1,4 +1,4 @@ -lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/ -usr/include +usr/lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/*.so -/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc +usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig +usr/include diff --git a/debian/libzpool5linux.install.in b/debian/libzpool5linux.install.in index b9e872df..0e087a27 100644 --- a/debian/libzpool5linux.install.in +++ b/debian/libzpool5linux.install.in @@ -1 +1 @@ -lib/@DEB_HOST_MULTIARCH@/libzpool.so.* +usr/lib/@DEB_HOST_MULTIARCH@/libzpool.so.* diff --git a/debian/rules b/debian/rules index dc1c1c51..9299985a 100755 --- a/debian/rules +++ b/debian/rules @@ -27,18 +27,19 @@ override_dh_auto_configure: @# Build the userland, but don't build the kernel modules. dh_auto_configure -- \ --bindir=/usr/bin \ - --sbindir=/sbin \ - --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \ - --with-udevdir=/lib/udev \ + --sbindir=/usr/sbin \ + --with-mounthelperdir=/usr/sbin \ + --libdir=/usr/lib/"$(DEB_HOST_MULTIARCH)" \ + --with-udevdir=/usr/lib/udev \ --with-zfsexecdir=/usr/lib/zfs-linux \ --enable-systemd \ --enable-pyzfs \ --with-python=python3 \ - --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \ + --with-pammoduledir='/usr/lib/$(DEB_HOST_MULTIARCH)/security' \ --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \ - --with-systemdunitdir=/lib/systemd/system \ - --with-systemdpresetdir=/lib/systemd/system-preset \ - --with-systemdgeneratordir=/lib/systemd/system-generators \ + --with-systemdunitdir=/usr/lib/systemd/system \ + --with-systemdpresetdir=/usr/lib/systemd/system-preset \ + --with-systemdgeneratordir=/usr/lib/systemd/system-generators \ --with-config=user for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \ @@ -61,21 +62,12 @@ override_dh_auto_install: $(MAKE) install DESTDIR='$(CURDIR)/debian/tmp' # Move from bin_dir to /usr/sbin - # Remove suffix (.py) as per policy 10.4 - Scripts - # https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/' mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary' mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat' mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat' - @# Zed has dependencies outside of the system root. - mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed' - mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) - for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \ - ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \ - rm $${i}; \ - done chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions' chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs' @@ -93,7 +85,7 @@ override_dh_auto_clean: @if test -e META.orig; then mv META.orig META; fi override_dh_install: - find debian/tmp/lib -name '*.la' -delete + find debian/tmp/usr/lib -name '*.la' -delete dh_install override_dh_missing: diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev index 0cf21a42..36c4bbbf 100755 --- a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev +++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev @@ -5,7 +5,7 @@ PREREQ="udev" PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules" -COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id" +COPY_EXEC_LIST="/usr/lib/udev/zvol_id /usr/lib/udev/vdev_id" # Generic result code. RC=0 @@ -33,18 +33,18 @@ fi . /usr/share/initramfs-tools/hook-functions -mkdir -p "$DESTDIR/lib/udev/rules.d/" +mkdir -p "$DESTDIR/usr/lib/udev/rules.d/" for ii in $PREREQ_UDEV_RULES do if [ -e "/etc/udev/rules.d/$ii" ] then - cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/" + cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/" elif [ -e "/lib/udev/rules.d/$ii" ] then - cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/" + cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/" else echo "Error: Missing udev rule: $ii" - echo " This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory." + echo " This file must be in the /etc/udev/rules.d or /usr/lib/udev/rules.d directory." exit 1 fi done diff --git a/debian/zfs-test.install b/debian/zfs-test.install index cafcfdc0..1ac2c00b 100644 --- a/debian/zfs-test.install +++ b/debian/zfs-test.install @@ -1,5 +1,5 @@ -sbin/zinject -sbin/ztest +usr/sbin/zinject +usr/sbin/ztest usr/bin/raidz_test usr/share/man/man1/raidz_test.1 usr/share/man/man1/test-runner.1 diff --git a/debian/zfs-zed.install b/debian/zfs-zed.install index a348ba82..30699a8a 100644 --- a/debian/zfs-zed.install +++ b/debian/zfs-zed.install @@ -1,5 +1,5 @@ etc/zfs/zed.d/* -lib/systemd/system/zfs-zed.service +usr/lib/systemd/system/zfs-zed.service usr/lib/zfs-linux/zed.d/* usr/sbin/zed usr/share/man/man8/zed.8 diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install index 2fd7aefe..c6a97ce1 100644 --- a/debian/zfsutils-linux.install +++ b/debian/zfsutils-linux.install @@ -2,45 +2,45 @@ etc/default/zfs etc/zfs/zfs-functions etc/zfs/zpool.d/ -lib/systemd/system-preset/ -lib/systemd/system/zfs-import-cache.service -lib/systemd/system/zfs-import-scan.service -lib/systemd/system/zfs-import@.service -lib/systemd/system/zfs-import.target -lib/systemd/system/zfs-import.service -lib/systemd/system/zfs-load-key.service -lib/systemd/system/zfs-mount.service -lib/systemd/system/zfs-scrub-monthly@.timer -lib/systemd/system/zfs-scrub-weekly@.timer -lib/systemd/system/zfs-scrub@.service -lib/systemd/system/zfs-share.service -lib/systemd/system/zfs-trim-monthly@.timer -lib/systemd/system/zfs-trim-weekly@.timer -lib/systemd/system/zfs-trim@.service -lib/systemd/system/zfs-volume-wait.service -lib/systemd/system/zfs-volumes.target -lib/systemd/system/zfs.target -lib/systemd/system-generators/zfs-mount-generator -lib/udev/ -sbin/fsck.zfs -sbin/mount.zfs -sbin/zdb -sbin/zfs -sbin/zfs_ids_to_path -sbin/zgenhostid -sbin/zhack -sbin/zpool -sbin/zstream -sbin/zstreamdump usr/bin/zvol_wait usr/bin/zilstat usr/lib/modules-load.d/ lib/ +usr/lib/systemd/system-preset/ +usr/lib/systemd/system/zfs-import-cache.service +usr/lib/systemd/system/zfs-import-scan.service +usr/lib/systemd/system/zfs-import@.service +usr/lib/systemd/system/zfs-import.target +usr/lib/systemd/system/zfs-import.service +usr/lib/systemd/system/zfs-load-key.service +usr/lib/systemd/system/zfs-mount.service +usr/lib/systemd/system/zfs-scrub-monthly@.timer +usr/lib/systemd/system/zfs-scrub-weekly@.timer +usr/lib/systemd/system/zfs-scrub@.service +usr/lib/systemd/system/zfs-share.service +usr/lib/systemd/system/zfs-trim-monthly@.timer +usr/lib/systemd/system/zfs-trim-weekly@.timer +usr/lib/systemd/system/zfs-trim@.service +usr/lib/systemd/system/zfs-volume-wait.service +usr/lib/systemd/system/zfs-volumes.target +usr/lib/systemd/system/zfs.target +usr/lib/systemd/system-generators/zfs-mount-generator +usr/lib/udev/ usr/lib/zfs-linux/zfs_prepare_disk usr/lib/zfs-linux/zpool.d/ usr/lib/zfs-linux/zpool_influxdb usr/sbin/arc_summary usr/sbin/arcstat usr/sbin/dbufstat +usr/sbin/fsck.zfs +usr/sbin/mount.zfs +usr/sbin/zdb +usr/sbin/zfs +usr/sbin/zfs_ids_to_path +usr/sbin/zgenhostid +usr/sbin/zhack +usr/sbin/zpool +usr/sbin/zstream +usr/sbin/zstreamdump usr/share/bash-completion/completions usr/share/man/man8/arcstat.8 usr/share/man/man1/zhack.1 diff --git a/debian/zfsutils-linux.links b/debian/zfsutils-linux.links index adb63c18..faa031bb 100644 --- a/debian/zfsutils-linux.links +++ b/debian/zfsutils-linux.links @@ -1,3 +1,3 @@ -sbin/zfs bin/zfs -sbin/zpool bin/zpool +usr/sbin/zfs usr/bin/zfs +usr/sbin/zpool usr/bin/zpool usr/lib/zfs-linux/zpool_influxdb bin/zpool_influxdb -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [pve-devel] [PATCH zfsonlinux 3/5] debian: install files to /usr 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 3/5] debian: install files to /usr Stoiko Ivanov @ 2024-09-03 9:32 ` Fabian Grünbichler 0 siblings, 0 replies; 7+ messages in thread From: Fabian Grünbichler @ 2024-09-03 9:32 UTC (permalink / raw) To: Proxmox VE development discussion On August 20, 2024 6:45 pm, Stoiko Ivanov wrote: > follows commit 902967808693510631a198414dc57dc4ca564afe in debian > upstream [0], which was done to support usrmerge > > [0] https://salsa.debian.org/zfsonlinux-team/zfs while all bookworm systems should be usrmerged, we probably should still change references in our code to use the new locations? a quick grep shows at least PVE::API2::Disks::ZFS using "/sbin/zfs" and "/sbin/zpool", there might be other locations (like package maintainer scripts?) as well though.. > Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> > --- > 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.in | 2 +- > debian/libzfslinux-dev.install.in | 6 +- > debian/libzpool5linux.install.in | 2 +- > debian/rules | 26 +++----- > .../usr/share/initramfs-tools/hooks/zdev | 10 ++-- > debian/zfs-test.install | 4 +- > debian/zfs-zed.install | 2 +- > debian/zfsutils-linux.install | 60 +++++++++---------- > debian/zfsutils-linux.links | 4 +- > 14 files changed, 60 insertions(+), 68 deletions(-) > delete mode 100644 debian/libpam-zfs.install > create mode 100644 debian/libpam-zfs.install.in > > diff --git a/debian/libnvpair3linux.install.in b/debian/libnvpair3linux.install.in > index ed7b541e..fce54227 100644 > --- a/debian/libnvpair3linux.install.in > +++ b/debian/libnvpair3linux.install.in > @@ -1 +1 @@ > -lib/@DEB_HOST_MULTIARCH@/libnvpair.so.* > +usr/lib/@DEB_HOST_MULTIARCH@/libnvpair.so.* > diff --git a/debian/libpam-zfs.install b/debian/libpam-zfs.install > deleted file mode 100644 > index c33123f6..00000000 > --- a/debian/libpam-zfs.install > +++ /dev/null > @@ -1,2 +0,0 @@ > -lib/*/security/pam_zfs_key.so > -usr/share/pam-configs/zfs_key > diff --git a/debian/libpam-zfs.install.in b/debian/libpam-zfs.install.in > new file mode 100644 > index 00000000..036b2e8b > --- /dev/null > +++ b/debian/libpam-zfs.install.in > @@ -0,0 +1,2 @@ > +usr/lib/@DEB_HOST_MULTIARCH@/security/pam_zfs_key.so > +usr/share/pam-configs/zfs_key > diff --git a/debian/libuutil3linux.install.in b/debian/libuutil3linux.install.in > index a197d030..bb333867 100644 > --- a/debian/libuutil3linux.install.in > +++ b/debian/libuutil3linux.install.in > @@ -1 +1 @@ > -lib/@DEB_HOST_MULTIARCH@/libuutil.so.* > +usr/lib/@DEB_HOST_MULTIARCH@/libuutil.so.* > diff --git a/debian/libzfs4linux.install.in b/debian/libzfs4linux.install.in > index 6765aaee..a9054c14 100644 > --- a/debian/libzfs4linux.install.in > +++ b/debian/libzfs4linux.install.in > @@ -1,2 +1,2 @@ > -lib/@DEB_HOST_MULTIARCH@/libzfs.so.* > -lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.* > +usr/lib/@DEB_HOST_MULTIARCH@/libzfs.so.* > +usr/lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.* > diff --git a/debian/libzfsbootenv1linux.install.in b/debian/libzfsbootenv1linux.install.in > index 49216742..b61b8ab6 100644 > --- a/debian/libzfsbootenv1linux.install.in > +++ b/debian/libzfsbootenv1linux.install.in > @@ -1 +1 @@ > -lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.* > +usr/lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.* > diff --git a/debian/libzfslinux-dev.install.in b/debian/libzfslinux-dev.install.in > index e515ddb8..7605b4db 100644 > --- a/debian/libzfslinux-dev.install.in > +++ b/debian/libzfslinux-dev.install.in > @@ -1,4 +1,4 @@ > -lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/ > -usr/include > +usr/lib/@DEB_HOST_MULTIARCH@/*.a > usr/lib/@DEB_HOST_MULTIARCH@/*.so > -/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc > +usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig > +usr/include > diff --git a/debian/libzpool5linux.install.in b/debian/libzpool5linux.install.in > index b9e872df..0e087a27 100644 > --- a/debian/libzpool5linux.install.in > +++ b/debian/libzpool5linux.install.in > @@ -1 +1 @@ > -lib/@DEB_HOST_MULTIARCH@/libzpool.so.* > +usr/lib/@DEB_HOST_MULTIARCH@/libzpool.so.* > diff --git a/debian/rules b/debian/rules > index dc1c1c51..9299985a 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -27,18 +27,19 @@ override_dh_auto_configure: > @# Build the userland, but don't build the kernel modules. > dh_auto_configure -- \ > --bindir=/usr/bin \ > - --sbindir=/sbin \ > - --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \ > - --with-udevdir=/lib/udev \ > + --sbindir=/usr/sbin \ > + --with-mounthelperdir=/usr/sbin \ > + --libdir=/usr/lib/"$(DEB_HOST_MULTIARCH)" \ > + --with-udevdir=/usr/lib/udev \ > --with-zfsexecdir=/usr/lib/zfs-linux \ > --enable-systemd \ > --enable-pyzfs \ > --with-python=python3 \ > - --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \ > + --with-pammoduledir='/usr/lib/$(DEB_HOST_MULTIARCH)/security' \ > --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \ > - --with-systemdunitdir=/lib/systemd/system \ > - --with-systemdpresetdir=/lib/systemd/system-preset \ > - --with-systemdgeneratordir=/lib/systemd/system-generators \ > + --with-systemdunitdir=/usr/lib/systemd/system \ > + --with-systemdpresetdir=/usr/lib/systemd/system-preset \ > + --with-systemdgeneratordir=/usr/lib/systemd/system-generators \ > --with-config=user > > for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \ > @@ -61,21 +62,12 @@ override_dh_auto_install: > $(MAKE) install DESTDIR='$(CURDIR)/debian/tmp' > > # Move from bin_dir to /usr/sbin > - # Remove suffix (.py) as per policy 10.4 - Scripts > - # https://www.debian.org/doc/debian-policy/ch-files.html#s-scripts > mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/' > mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary' > mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat' > mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat' > > - @# Zed has dependencies outside of the system root. > - mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed' > - > mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) > - for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \ > - ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \ > - rm $${i}; \ > - done > > chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions' > chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs' > @@ -93,7 +85,7 @@ override_dh_auto_clean: > @if test -e META.orig; then mv META.orig META; fi > > override_dh_install: > - find debian/tmp/lib -name '*.la' -delete > + find debian/tmp/usr/lib -name '*.la' -delete > dh_install > > override_dh_missing: > diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev > index 0cf21a42..36c4bbbf 100755 > --- a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev > +++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev > @@ -5,7 +5,7 @@ > > PREREQ="udev" > PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules" > -COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id" > +COPY_EXEC_LIST="/usr/lib/udev/zvol_id /usr/lib/udev/vdev_id" > > # Generic result code. > RC=0 > @@ -33,18 +33,18 @@ fi > > . /usr/share/initramfs-tools/hook-functions > > -mkdir -p "$DESTDIR/lib/udev/rules.d/" > +mkdir -p "$DESTDIR/usr/lib/udev/rules.d/" > for ii in $PREREQ_UDEV_RULES > do > if [ -e "/etc/udev/rules.d/$ii" ] > then > - cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/" > + cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/" > elif [ -e "/lib/udev/rules.d/$ii" ] > then > - cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/" > + cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/usr/lib/udev/rules.d/" > else > echo "Error: Missing udev rule: $ii" > - echo " This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory." > + echo " This file must be in the /etc/udev/rules.d or /usr/lib/udev/rules.d directory." > exit 1 > fi > done > diff --git a/debian/zfs-test.install b/debian/zfs-test.install > index cafcfdc0..1ac2c00b 100644 > --- a/debian/zfs-test.install > +++ b/debian/zfs-test.install > @@ -1,5 +1,5 @@ > -sbin/zinject > -sbin/ztest > +usr/sbin/zinject > +usr/sbin/ztest > usr/bin/raidz_test > usr/share/man/man1/raidz_test.1 > usr/share/man/man1/test-runner.1 > diff --git a/debian/zfs-zed.install b/debian/zfs-zed.install > index a348ba82..30699a8a 100644 > --- a/debian/zfs-zed.install > +++ b/debian/zfs-zed.install > @@ -1,5 +1,5 @@ > etc/zfs/zed.d/* > -lib/systemd/system/zfs-zed.service > +usr/lib/systemd/system/zfs-zed.service > usr/lib/zfs-linux/zed.d/* > usr/sbin/zed > usr/share/man/man8/zed.8 > diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install > index 2fd7aefe..c6a97ce1 100644 > --- a/debian/zfsutils-linux.install > +++ b/debian/zfsutils-linux.install > @@ -2,45 +2,45 @@ > etc/default/zfs > etc/zfs/zfs-functions > etc/zfs/zpool.d/ > -lib/systemd/system-preset/ > -lib/systemd/system/zfs-import-cache.service > -lib/systemd/system/zfs-import-scan.service > -lib/systemd/system/zfs-import@.service > -lib/systemd/system/zfs-import.target > -lib/systemd/system/zfs-import.service > -lib/systemd/system/zfs-load-key.service > -lib/systemd/system/zfs-mount.service > -lib/systemd/system/zfs-scrub-monthly@.timer > -lib/systemd/system/zfs-scrub-weekly@.timer > -lib/systemd/system/zfs-scrub@.service > -lib/systemd/system/zfs-share.service > -lib/systemd/system/zfs-trim-monthly@.timer > -lib/systemd/system/zfs-trim-weekly@.timer > -lib/systemd/system/zfs-trim@.service > -lib/systemd/system/zfs-volume-wait.service > -lib/systemd/system/zfs-volumes.target > -lib/systemd/system/zfs.target > -lib/systemd/system-generators/zfs-mount-generator > -lib/udev/ > -sbin/fsck.zfs > -sbin/mount.zfs > -sbin/zdb > -sbin/zfs > -sbin/zfs_ids_to_path > -sbin/zgenhostid > -sbin/zhack > -sbin/zpool > -sbin/zstream > -sbin/zstreamdump > usr/bin/zvol_wait > usr/bin/zilstat > usr/lib/modules-load.d/ lib/ > +usr/lib/systemd/system-preset/ > +usr/lib/systemd/system/zfs-import-cache.service > +usr/lib/systemd/system/zfs-import-scan.service > +usr/lib/systemd/system/zfs-import@.service > +usr/lib/systemd/system/zfs-import.target > +usr/lib/systemd/system/zfs-import.service > +usr/lib/systemd/system/zfs-load-key.service > +usr/lib/systemd/system/zfs-mount.service > +usr/lib/systemd/system/zfs-scrub-monthly@.timer > +usr/lib/systemd/system/zfs-scrub-weekly@.timer > +usr/lib/systemd/system/zfs-scrub@.service > +usr/lib/systemd/system/zfs-share.service > +usr/lib/systemd/system/zfs-trim-monthly@.timer > +usr/lib/systemd/system/zfs-trim-weekly@.timer > +usr/lib/systemd/system/zfs-trim@.service > +usr/lib/systemd/system/zfs-volume-wait.service > +usr/lib/systemd/system/zfs-volumes.target > +usr/lib/systemd/system/zfs.target > +usr/lib/systemd/system-generators/zfs-mount-generator > +usr/lib/udev/ > usr/lib/zfs-linux/zfs_prepare_disk > usr/lib/zfs-linux/zpool.d/ > usr/lib/zfs-linux/zpool_influxdb > usr/sbin/arc_summary > usr/sbin/arcstat > usr/sbin/dbufstat > +usr/sbin/fsck.zfs > +usr/sbin/mount.zfs > +usr/sbin/zdb > +usr/sbin/zfs > +usr/sbin/zfs_ids_to_path > +usr/sbin/zgenhostid > +usr/sbin/zhack > +usr/sbin/zpool > +usr/sbin/zstream > +usr/sbin/zstreamdump > usr/share/bash-completion/completions > usr/share/man/man8/arcstat.8 > usr/share/man/man1/zhack.1 > diff --git a/debian/zfsutils-linux.links b/debian/zfsutils-linux.links > index adb63c18..faa031bb 100644 > --- a/debian/zfsutils-linux.links > +++ b/debian/zfsutils-linux.links > @@ -1,3 +1,3 @@ > -sbin/zfs bin/zfs > -sbin/zpool bin/zpool > +usr/sbin/zfs usr/bin/zfs > +usr/sbin/zpool usr/bin/zpool > usr/lib/zfs-linux/zpool_influxdb bin/zpool_influxdb > -- > 2.39.2 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 4/5] d/zfsutils-linux.install: move most exectuables from sbin to bin 2024-08-20 16:45 [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge Stoiko Ivanov ` (2 preceding siblings ...) 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 3/5] debian: install files to /usr Stoiko Ivanov @ 2024-08-20 16:45 ` Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 5/5] d/NEWS: add news for usr-merge Stoiko Ivanov 4 siblings, 0 replies; 7+ messages in thread From: Stoiko Ivanov @ 2024-08-20 16:45 UTC (permalink / raw) To: pve-devel follows commit e1e64f07af5c4ca2a313625a15c24e4ad6fb42f1 in debian upstream [0]. context from upstream's commit message: - arc_summary and zilstat do not require privilege. - arcstat does not need root, but the name is taken by nordugrid-arc-client. - dbufstat needs root permission to read /proc/spl/kstat. differences: we never shipped zvol_wait and zilstat in /sbin, so no need for the compatibility symlink. [0] https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- debian/rules | 6 ------ debian/zfsutils-linux.install | 6 +++--- debian/zfsutils-linux.links | 2 ++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/rules b/debian/rules index 9299985a..224fd9fd 100755 --- a/debian/rules +++ b/debian/rules @@ -61,12 +61,6 @@ override_dh_auto_install: @# Install the utilities. $(MAKE) install DESTDIR='$(CURDIR)/debian/tmp' - # Move from bin_dir to /usr/sbin - mkdir -p '$(CURDIR)/debian/tmp/usr/sbin/' - mv '$(CURDIR)/debian/tmp/usr/bin/arc_summary' '$(CURDIR)/debian/tmp/usr/sbin/arc_summary' - mv '$(CURDIR)/debian/tmp/usr/bin/arcstat' '$(CURDIR)/debian/tmp/usr/sbin/arcstat' - mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat' - mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions' diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install index c6a97ce1..e120d6c7 100644 --- a/debian/zfsutils-linux.install +++ b/debian/zfsutils-linux.install @@ -28,9 +28,9 @@ usr/lib/udev/ usr/lib/zfs-linux/zfs_prepare_disk usr/lib/zfs-linux/zpool.d/ usr/lib/zfs-linux/zpool_influxdb -usr/sbin/arc_summary -usr/sbin/arcstat -usr/sbin/dbufstat +usr/bin/arc_summary +usr/bin/arcstat usr/sbin +usr/bin/dbufstat usr/sbin usr/sbin/fsck.zfs usr/sbin/mount.zfs usr/sbin/zdb diff --git a/debian/zfsutils-linux.links b/debian/zfsutils-linux.links index faa031bb..9a516905 100644 --- a/debian/zfsutils-linux.links +++ b/debian/zfsutils-linux.links @@ -1,3 +1,5 @@ usr/sbin/zfs usr/bin/zfs usr/sbin/zpool usr/bin/zpool usr/lib/zfs-linux/zpool_influxdb bin/zpool_influxdb +usr/bin/arc_summary usr/sbin/arc_summary + -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [pve-devel] [PATCH zfsonlinux 5/5] d/NEWS: add news for usr-merge 2024-08-20 16:45 [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge Stoiko Ivanov ` (3 preceding siblings ...) 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 4/5] d/zfsutils-linux.install: move most exectuables from sbin to bin Stoiko Ivanov @ 2024-08-20 16:45 ` Stoiko Ivanov 4 siblings, 0 replies; 7+ messages in thread From: Stoiko Ivanov @ 2024-08-20 16:45 UTC (permalink / raw) To: pve-devel to raise awareness for the changed paths (NEWS entries get displayed when installing updates). follows commit 20e286d2f5c8752ac1372cd084729147cf276f3f in debian upstream [0]. [0] https://salsa.debian.org/zfsonlinux-team/zfs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- debian/NEWS | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 debian/NEWS diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 00000000..464999be --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,13 @@ +zfs-linux (2.2.5-pve1) UNRELEASED; urgency=medium + + zfs-linux has now opted-in usr-merge. No behavioral changes should be noted. + + arc_summary was moved from /usr/sbin to /usr/bin and a link was added to + avoid breaking existing scripts. Users calling these executables should + update all absolute paths used. + + As an exception, the name /usr/bin/arcstat is taken by another different + package, nordugrid-arc-client. Thus zfs-linux still uses /usr/sbin/arcstat. + + -- Proxmox Support Team <support@proxmox.com> Mon, 19 Aug 2024 19:00:21 +0200 + -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-09-03 9:32 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-08-20 16:45 [pve-devel] [PATCH zfsonlinux 0/5] update to ZFS 2.2.5 and opt-in to usrmerge Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 1/5] update zfs submodule to 2.2.5 Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 2/5] debian: remove libzfsbootenv1linux.install Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 3/5] debian: install files to /usr Stoiko Ivanov 2024-09-03 9:32 ` Fabian Grünbichler 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 4/5] d/zfsutils-linux.install: move most exectuables from sbin to bin Stoiko Ivanov 2024-08-20 16:45 ` [pve-devel] [PATCH zfsonlinux 5/5] d/NEWS: add news for usr-merge Stoiko Ivanov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox