summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2021-05-11 14:39:46 +0200
committerSimon Rettberg2021-05-11 14:40:13 +0200
commitc80bcade864ea98f1a41b19c163ccf1f2a0a49e2 (patch)
treeb23f7500a7645075cc0c6a17285fceedb25510aa
parent[minilinux] Fix: List of used menus was incomplete (diff)
downloadslx-admin-3.10.tar.gz
slx-admin-3.10.tar.xz
slx-admin-3.10.zip
[systemstatus] Fix displaying VM store usage if using internal storagev3.10v3.10
-rw-r--r--modules-available/systemstatus/inc/systemstatus.inc.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules-available/systemstatus/inc/systemstatus.inc.php b/modules-available/systemstatus/inc/systemstatus.inc.php
index 4413af5f..f6d18801 100644
--- a/modules-available/systemstatus/inc/systemstatus.inc.php
+++ b/modules-available/systemstatus/inc/systemstatus.inc.php
@@ -23,17 +23,18 @@ class SystemStatus
if (!isset($task['data']['list']) || empty($task['data']['list']))
return false;
$wantedSource = Property::getVmStoreUrl();
- $currentSource = false;
$storeUsage = false;
$systemUsage = false;
if ($wantedSource === '<local>') {
$storePoint = '/';
+ $currentSource = $wantedSource;
} else {
$storePoint = CONFIG_VMSTORE_DIR;
+ $currentSource = false;
}
// Collect free space information
foreach ($task['data']['list'] as $entry) {
- // StorePoint is either the atual directory of the vmstore, or / if we use internal storage
+ // StorePoint is either the actual directory of the vmstore, or / if we use internal storage
if ($entry['mountPoint'] === $storePoint) {
$storeUsage = $entry;
}
@@ -42,8 +43,7 @@ class SystemStatus
$systemUsage = $entry;
}
// Record what's mounted at destination, regardless of config, to indicate something is wrong
- if (($currentSource === false && $wantedSource === '<local>' && $entry['mountPoint'] === '/')
- || $entry['mountPoint'] === CONFIG_VMSTORE_DIR) {
+ if ($entry['mountPoint'] === CONFIG_VMSTORE_DIR) {
$currentSource = $entry['fileSystem'];
}
}