diff options
| author | ramon <ramongomez@us.es> | 2017-03-16 10:19:14 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2017-03-16 10:19:14 +0000 |
| commit | 2fd905421982e4ee2112a0a73a4051c93465d731 (patch) | |
| tree | ee55476f5dffa36c503fc97529004c5a2a238f10 /admin/WebConsole/rest/server.php | |
| parent | 2a337db7fc78a6c71fb284c9ca9f598407604450 (diff) | |
#708: Ruta REST para configuración de discos: incluir siempre nº de disco para evitar fallos si datos no ordenados.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5237 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/WebConsole/rest/server.php')
| -rw-r--r-- | admin/WebConsole/rest/server.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/WebConsole/rest/server.php b/admin/WebConsole/rest/server.php index 12cefbe2..5e544396 100644 --- a/admin/WebConsole/rest/server.php +++ b/admin/WebConsole/rest/server.php @@ -745,9 +745,11 @@ EOD; continue; } $tmp = Array(); + // Common data. + $tmp['disk'] = $rs->campos["numdisk"]; + $tmp['size'] = $rs->campos["tamano"]; if ($rs->campos["numpar"] == 0) { // Disk data. - $tmp['disk'] = $rs->campos["numdisk"]; switch ($rs->campos["codpar"]) { case 1: $tmp['parttable'] = "MSDOS"; break; case 2: $tmp['parttable'] = "GPT"; break; @@ -755,13 +757,11 @@ EOD; case 4: $tmp['parttable'] = "ZPOOL"; break; default: $tmp['parttable'] = $rs->campos["codpar"]; } - $tmp['size'] = $rs->campos["tamano"]; } else { // Partition data. $tmp['partition'] = $rs->campos["numpar"]; $tmp['parttype'] = $rs->campos["tipopar"]; $tmp['filesystem'] = $rs->campos["nemonico"]; - $tmp['size'] = $rs->campos["tamano"]; $tmp['usage'] = $rs->campos["uso"]; if ($rs->campos["nombreso"] != null) { $tmp['os'] = $rs->campos["nombreso"]; |