diff options
| author | ramon <ramongomez@us.es> | 2015-07-14 11:45:51 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2015-07-14 11:45:51 +0000 |
| commit | b0c96832343256b7983981a5277518dbd06d64a0 (patch) | |
| tree | 7cb214afc25c58297da8e030943558be3e3faba8 /admin/Interface/getConfiguration | |
| parent | 695c8e6b17be81f86db89ea0f7c9aa4bdf36e45f (diff) | |
#711: Integrar código del ticket:711 y modificar ogAdmServer para guardar porcentaje de uso en la BD.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4666 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'admin/Interface/getConfiguration')
| -rwxr-xr-x | admin/Interface/getConfiguration | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/admin/Interface/getConfiguration b/admin/Interface/getConfiguration index 0979986d..fbed5a98 100755 --- a/admin/Interface/getConfiguration +++ b/admin/Interface/getConfiguration @@ -21,7 +21,7 @@ for ((dsk=1; dsk<=$disks; dsk++)); do *) ptt=0 ;; esac # Información de disco (partición 0) - cfg="$cfg$dsk:0:$ptt:::$(ogGetDiskSize $dsk);" + cfg="$cfg$dsk:0:$ptt:::$(ogGetDiskSize $dsk):0;" for ((par=1;par<=$particiones;par++)); do # Código del identificador de tipo de partición cod=$(ogGetPartitionId $dsk $par 2>/dev/null) @@ -34,13 +34,15 @@ for ((dsk=1; dsk<=$disks; dsk++)); do # Sistema operativo instalado case "$fsi" in ""|EMPTY|CACHE|LINUX-SWAP|LINUX-LVM) - soi="" ;; + soi=""; uso=0 ;; *) 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}') + uso=${uso:0} ;; esac - cfg="$cfg$dsk:$par:$cod:$fsi:$soi:$tam;" + cfg="$cfg$dsk:$par:$cod:$fsi:$soi:$tam:$uso;" done done @@ -58,8 +60,8 @@ generateMenuDefault &>/dev/null awk '{ n=split($0,sep,";"); for (i=1; i<n; i++){ split (sep[i],dua,":"); - printf ("disk=%s\tpar=%s\tcpt=%s\tfsi=%s\tsoi=%s\ttam=%s\n", - dua[1],dua[2],dua[3],dua[4],dua[5],dua[6]); + printf ("disk=%s\tpar=%s\tcpt=%s\tfsi=%s\tsoi=%s\ttam=%s\tuso=%s\n", + dua[1],dua[2],dua[3],dua[4],dua[5],dua[6],dua[7]); } }' $cfgfile |