summaryrefslogtreecommitdiffstats
path: root/modules-available/vmstore
diff options
context:
space:
mode:
authorSimon Rettberg2022-07-06 16:16:21 +0200
committerSimon Rettberg2022-07-06 16:16:21 +0200
commitf2123bdbcb0e6c24ba04a46bafc904b05e8b013c (patch)
tree8775d555331f0a062584b395139a2facaf2dbdf1 /modules-available/vmstore
parent[statistics] Fix problems with unusual column names in query builder (diff)
downloadslx-admin-f2123bdbcb0e6c24ba04a46bafc904b05e8b013c.tar.gz
slx-admin-f2123bdbcb0e6c24ba04a46bafc904b05e8b013c.tar.xz
slx-admin-f2123bdbcb0e6c24ba04a46bafc904b05e8b013c.zip
[vmstore] Fix NFS speed test
Diffstat (limited to 'modules-available/vmstore')
-rw-r--r--modules-available/vmstore/page.inc.php4
1 files changed, 2 insertions, 2 deletions
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',