X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FTools.pm;h=f91d35a1df52aa3a49acd8ebedf50147d08f8ceb;hp=2525e55ceb95ed1b9fccf41b9e8defa03db81dd9;hb=ed61b9d67588465f101ec043a1e224608c833e02;hpb=a2d049afde002df646af4eed4b2c5ec22a251400

diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index 2525e55..f91d35a 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -150,7 +150,7 @@ sub lock_file_full {
 	    or die "can't open file - $!\n";
 
 	if (!flock($fh, $mode|LOCK_NB)) {
-	    print STDERR "trying to acquire lock...";
+	    print STDERR "trying to acquire lock...\n";
 	    my $success;
 	    while(1) {
 		$success = flock($fh, $mode);
@@ -369,6 +369,7 @@ sub run_command {
     my $afterfork;
     my $noerr;
     my $keeplocale;
+    my $quiet;
 
     eval {
 
@@ -395,6 +396,8 @@ sub run_command {
 		$noerr = $param{$p};
 	    } elsif ($p eq 'keeplocale') {
 		$keeplocale = $param{$p};
+	    } elsif ($p eq 'quiet') {
+		$quiet = $param{$p};
 	    } else {
 		die "got unknown parameter '$p' for run_command\n";
 	    }
@@ -497,7 +500,7 @@ sub run_command {
 			    waitpid ($pid, 0);
 			    die $err;
 			}
-		    } else {
+		    } elsif (!$quiet) {
 			print $buf;
 			*STDOUT->flush();
 		    }
@@ -517,7 +520,7 @@ sub run_command {
 			    waitpid ($pid, 0);
 			    die $err;
 			}
-		    } else {
+		    } elsif (!$quiet) {
 			print STDERR $buf;
 			*STDERR->flush();
 		    }
@@ -791,17 +794,20 @@ sub extract_param {
 
 # Note: we use this to wait until vncterm/spiceterm is ready
 sub wait_for_vnc_port {
-    my ($port, $timeout) = @_;
+    my ($port, $family, $timeout) = @_;
 
     $timeout = 5 if !$timeout;
     my $sleeptime = 0;
     my $starttime = [gettimeofday];
     my $elapsed;
 
+    my $cmd = ['/bin/ss', '-Htln', "sport = :$port"];
+    push @$cmd, $family == AF_INET6 ? '-6' : '-4' if defined($family);
+
     my $found;
     while (($elapsed = tv_interval($starttime)) < $timeout) {
 	# -Htln = don't print header, tcp, listening sockets only, numeric ports
-	run_command(['/bin/ss', '-Htln', "sport = :$port"], outfunc => sub {
+	run_command($cmd, outfunc => sub {
 	    my $line = shift;
 	    if ($line =~ m/^LISTEN\s+\d+\s+\d+\s+\S+:(\d+)\s/) {
 		$found = 1 if ($port == $1);
@@ -812,7 +818,7 @@ sub wait_for_vnc_port {
 	usleep($sleeptime);
     }
 
-    return undef;
+    die "Timeout while waiting for port '$port' to get ready!\n";
 }
 
 sub next_unused_port {
@@ -1626,9 +1632,16 @@ sub encrypt_pw {
 }
 
 # intended usage: convert_size($val, "kb" => "gb")
-# on reduction (converting to a bigger unit) we round up by default if
-# information got lost. E.g. `convert_size(1023, "b" => "kb")` returns 1
+# we round up to the next integer by default
+# E.g. `convert_size(1023, "b" => "kb")` returns 1
 # use $no_round_up to switch this off, above example would then return 0
+# this is also true for converting down e.g. 0.0005 gb to mb returns 1
+# (0 if $no_round_up is true)
+# allowed formats for value:
+# 1234
+# 1234.
+# 1234.1234
+# .1234
 sub convert_size {
     my ($value, $from, $to, $no_round_up) = @_;
 
@@ -1641,21 +1654,22 @@ sub convert_size {
 	pb => 5,
     };
 
-    $from = lc($from); $to = lc($to);
+    die "no value given"
+	if !defined($value) || $value eq "";
+
+    $from = lc($from // ''); $to = lc($to // '');
     die "unknown 'from' and/or 'to' units ($from => $to)"
-	if !(defined($units->{$from}) && defined($units->{$to}));
+	if !defined($units->{$from}) || !defined($units->{$to});
 
-    my $shift_amount = $units->{$from} - $units->{$to};
+    die "value '$value' is not a valid, positive number"
+	if $value !~ m/^(?:[0-9]+\.?[0-9]*|[0-9]*\.[0-9]+)$/;
 
-    if ($shift_amount > 0) {
-	$value <<= ($shift_amount * 10);
-    } elsif ($shift_amount < 0) {
-	my $remainder = ($value & (1 << abs($shift_amount)*10) - 1);
-	$value >>= abs($shift_amount) * 10;
-	$value++ if $remainder && !$no_round_up;
-    }
+    my $shift_amount = ($units->{$from} - $units->{$to}) * 10;
+
+    $value *= 2**$shift_amount;
+    $value++ if !$no_round_up && ($value - int($value)) > 0.0;
 
-    return $value;
+    return int($value);
 }
 
 1;