diff options
| author | ramon <ramongomez@us.es> | 2014-09-23 11:48:41 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2014-09-23 11:48:41 +0000 |
| commit | fd1846fe10d86fdc5df52e97536816c64ac33960 (patch) | |
| tree | ecc0bfe90470d054ecd0994fb1fea5942eed45e0 /admin | |
| parent | 2851a935492a9b29c346f631c1409f0ef81402b9 (diff) | |
#51: Integrar código del ticket:51 para detectar metadispositivos (LVM, RAID hardware y Multipath).
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4395 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/Interface/getConfiguration | 5 | ||||
| -rw-r--r-- | admin/WebConsole/includes/pintaParticiones.php | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/admin/Interface/getConfiguration b/admin/Interface/getConfiguration index 2bfdaeeb..0979986d 100755 --- a/admin/Interface/getConfiguration +++ b/admin/Interface/getConfiguration @@ -17,6 +17,7 @@ for ((dsk=1; dsk<=$disks; dsk++)); do case "$ptt" in MSDOS) ptt=1 ;; GPT) ptt=2 ;; + LVM) ptt=3 ;; *) ptt=0 ;; esac # Información de disco (partición 0) @@ -31,8 +32,8 @@ for ((dsk=1; dsk<=$disks; dsk++)); do tam=$(ogGetPartitionSize $dsk $par 2>/dev/null) tam=${tam:-"0"} # Sistema operativo instalado - case "$cod" in - ""|82|8200|A502|BF02|EE) + case "$fsi" in + ""|EMPTY|CACHE|LINUX-SWAP|LINUX-LVM) soi="" ;; *) soi=$(getOsVersion $dsk $par 2>/dev/null | cut -f2 -d:) # Sistema de archivos para datos (sistema operativo "DATA") diff --git a/admin/WebConsole/includes/pintaParticiones.php b/admin/WebConsole/includes/pintaParticiones.php index 33ab50da..210f4728 100644 --- a/admin/WebConsole/includes/pintaParticiones.php +++ b/admin/WebConsole/includes/pintaParticiones.php @@ -85,6 +85,8 @@ function pintaParticiones($cmd,$configuraciones,$idordenadores,$cc) break; case 2: $disktable[$tbKeys[$k]["numdisk"]] = "GPT"; break; + case 3: $disktable[$tbKeys[$k]["numdisk"]] = "LVM"; + break; default: $disktable[$tbKeys[$k]["numdisk"]] = ""; } } @@ -92,11 +94,16 @@ function pintaParticiones($cmd,$configuraciones,$idordenadores,$cc) echo'<tr height="16">'.chr(13); echo'<td align="center"> </td>'.chr(13); echo'<td align="center">'.$tbKeys[$k]["numpar"].'</td>'.chr(13); - if (is_numeric ($tbKeys[$k]["tipopar"])) { - echo '<td align="center"><em>'.sprintf("%02X",$tbKeys[$k]["tipopar"]).'</em></td>'.chr(13); + if ($disktable[$tbKeys[$k]["numdisk"]] == "LVM") { + echo '<td></td>'.chr(13); } else { - echo '<td align="center">'.$tbKeys[$k]["tipopar"].'</td>'.chr(13); + if (is_numeric ($tbKeys[$k]["tipopar"])) { + echo '<td align="center"><em>'.sprintf("%02X",$tbKeys[$k]["tipopar"]).'</em></td>'.chr(13); + } + else { + echo '<td align="center">'.$tbKeys[$k]["tipopar"].'</td>'.chr(13); + } } $filesys=tomaSistemasFicheros($tbKeys[$k]["numpar"],$idordenadores,false,$tbKeys[$k]["numdisk"]); echo'<td align="center"> '.$filesys.' </td>'.chr(13); |