From f2123bdbcb0e6c24ba04a46bafc904b05e8b013c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 6 Jul 2022 16:16:21 +0200 Subject: [vmstore] Fix NFS speed test --- modules-available/vmstore/page.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules-available/vmstore') diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php index b490e749..bd43cb54 100644 --- a/modules-available/vmstore/page.inc.php +++ b/modules-available/vmstore/page.inc.php @@ -136,7 +136,7 @@ class Page_VmStore extends Page Util::redirect('?do=vmstore&show=benchmark&action=result&id=' . $id); } $selectedServer = Request::post('server', 'auto', 'string'); - if ($selectedServer !== 'nfs' && !Dnbd3::isEnabled()) { + if ($selectedServer === 'nfs' || !Dnbd3::isEnabled()) { $selectedServer = 'nfs'; } elseif ($selectedServer !== 'auto') { $ip = Dnbd3::getServer($selectedServer); @@ -296,7 +296,7 @@ EOF; } } else { $client['stderr'] = substr($out['stderr'], 0, 4000) - . "\nStatus: {$out['state']}, ExitCode: {$out['exitCode']}'"; + . "\nStatus: {$out['state']}, ExitCode: {$out['exitCode']}"; $client['stdout'] = substr($out['stdout'], 0, 4000); } $m = Database::queryFirst('SELECT clientip, hostname FROM machine WHERE machineuuid = :uuid', -- cgit v1.2.3-55-g7522