summaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/Interface/getConfiguration4
-rw-r--r--admin/WebConsole/includes/pintaParticiones.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/admin/Interface/getConfiguration b/admin/Interface/getConfiguration
index fbed5a98..7a9636f2 100755
--- a/admin/Interface/getConfiguration
+++ b/admin/Interface/getConfiguration
@@ -18,6 +18,7 @@ for ((dsk=1; dsk<=$disks; dsk++)); do
MSDOS) ptt=1 ;;
GPT) ptt=2 ;;
LVM) ptt=3 ;;
+ ZPOOL) ptt=4 ;;
*) ptt=0 ;;
esac
# InformaciĆ³n de disco (particiĆ³n 0)
@@ -38,7 +39,8 @@ for ((dsk=1; dsk<=$disks; dsk++)); do
*) soi=$(getOsVersion $dsk $par 2>/dev/null | cut -f2 -d:)
# Sistema de archivos para datos (sistema operativo "DATA")
[ -z "$soi" -a "$fsi" != "EMPTY" -a "$fsi" != "CACHE" ] && soi="DATA"
- uso=$(df $(ogDiskToDev $dsk $par) | awk '{getline; printf "%d",$5}')
+ # Obtener porcentaje de uso.
+ uso=$(df $(ogMountPoint $dsk $par) | awk '{getline; printf "%d",$5}')
uso=${uso:0}
;;
esac
diff --git a/admin/WebConsole/includes/pintaParticiones.php b/admin/WebConsole/includes/pintaParticiones.php
index c209fffb..02379df7 100644
--- a/admin/WebConsole/includes/pintaParticiones.php
+++ b/admin/WebConsole/includes/pintaParticiones.php
@@ -87,6 +87,8 @@ function pintaParticiones($cmd,$configuraciones,$idordenadores,$cc)
break;
case 3: $disktable[$tbKeys[$k]["numdisk"]] = "LVM";
break;
+ case 4: $disktable[$tbKeys[$k]["numdisk"]] = "ZPOOL";
+ break;
default: $disktable[$tbKeys[$k]["numdisk"]] = "";
}
}
@@ -94,7 +96,7 @@ function pintaParticiones($cmd,$configuraciones,$idordenadores,$cc)
echo'<tr height="16">'.chr(13);
echo'<td align="center">&nbsp;</td>'.chr(13);
echo'<td align="center">'.$tbKeys[$k]["numpar"].'</td>'.chr(13);
- if ($disktable[$tbKeys[$k]["numdisk"]] == "LVM") {
+ if ($disktable[$tbKeys[$k]["numdisk"]] == "LVM" or $disktable[$tbKeys[$k]["numdisk"]] == "ZPOOL") {
echo '<td></td>'.chr(13);
}
else {