[pve-devel] [PATCH zfsonlinux 4/5] d/zfsutils-linux.install: move most exectuables from sbin to bin

[Stoiko Ivanov]

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 at 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