[pve-devel] [PATCH manager] pveperf: use fsync syscall from PVE::Tools

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Jan 30 17:17:13 CET 2019


allows to drop the libfile-sync-perl dependency

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 bin/pveperf                 |  6 ++++--
 debian/control              |  2 --
 www/manager6/ceph/Status.js | 12 ++++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/bin/pveperf b/bin/pveperf
index 6f6fe2d8..d994c239 100755
--- a/bin/pveperf
+++ b/bin/pveperf
@@ -2,10 +2,12 @@
 
 use strict;
 use warnings;
-use File::Sync;
+
 use Time::HiRes qw( usleep ualarm gettimeofday tv_interval );
 use Net::DNS::Resolver;
 
+use PVE::Tools;
+
 if ($#ARGV >= 1) {
     print STDERR "usage: $0 [PATH]\n";
     exit -1;
@@ -84,7 +86,7 @@ sub test_fsync {
  
 	    print TMP $data;
 
-	    File::Sync::fsync (\*TMP);
+	    PVE::Tools::fsync(fileno(\*TMP));
 
 	    close (TMP);
 
diff --git a/debian/control b/debian/control
index 712a4398..c441a2e1 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,6 @@ Depends: apt-transport-https,
          hdparm,
          ifenslave (>= 2.6) | ifupdown2,
          libapt-pkg-perl,
-         libauthen-pam-perl,
          libc6 (>= 2.14),
          libcrypt-ssleay-perl,
          libev-perl,
@@ -66,7 +65,6 @@ Depends: apt-transport-https,
          logrotate,
          lsb-base,
          lzop,
-         netcat-traditional,
          novnc-pve,
          pciutils,
          perl (>= 5.10.0-19),
diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js
index f75e7fcd..5d6f1d86 100644
--- a/www/manager6/ceph/Status.js
+++ b/www/manager6/ceph/Status.js
@@ -323,15 +323,11 @@ Ext.define('PVE.node.CephStatus', {
 		    if (Proxmox.UserName === 'root at pam') {
 			me.store.stopUpdate();
 
-			var win = Ext.create('PVE.ceph.Install', {
-			    modal: true,
-			    style: {
-				display: 'none'
-			    },
-			    nodename: nodename
+			var btn = Ext.create('Ext.button.Button', {
+			    renderTo: Ext.getBody(),
+			    text: 'FOO'
 			});
-			win.show();
-			me.el.mask(win.el.getHtml(), ['pve-static-mask']);
+			me.el.mask(btn.el.getHtml(), ['pve-static-mask']);
 		    } else {
 			me.store.stopUpdate();
 			me.el.mask(gettext("Ceph not installed. Log in as root to install."), ['pve-static-mask']);
-- 
2.20.1





More information about the pve-devel mailing list