adapted commit e1e64f07af5c4ca2a313625a15c24e4ad6fb42f1 from
debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs/:
- 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.
See: #1064835, #1063457
Originally-by: Shengqi Chen <harry-c...@outlook.com>
Signed-off-by: Stoiko Ivanov <s.iva...@proxmox.com>
---
debian/rules | 8 --------
debian/zfsutils-linux.install | 6 +++---
debian/zfsutils-linux.links | 3 +++
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/debian/rules b/debian/rules
index 02896d554..7db5f127c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,14 +61,6 @@ override_dh_auto_install:
@# Install the utilities.
$(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'
-
chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index c74d4b654..447baf6cd 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 54099e657..3c3fc442b 100644
--- a/debian/zfsutils-linux.links
+++ b/debian/zfsutils-linux.links
@@ -1,3 +1,6 @@
usr/sbin/zfs usr/bin/zfs
usr/sbin/zpool usr/bin/zpool
usr/lib/zfs-linux/zpool_influxdb usr/bin/zpool_influxdb
+usr/bin/arc_summary usr/sbin/arc_summary
+usr/bin/zilstat usr/sbin/zilstat
+usr/bin/zvol_wait usr/sbin/zvol_wait
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
