diff options
author | ramon <ramongomez@us.es> | 2012-06-01 12:11:31 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2012-06-01 12:11:31 +0000 |
commit | 5de6fb0de32f8b0db29ee8137a92b23b9cbc9ada (patch) | |
tree | c58480f4f239e172e635af22db59087c0acf948d | |
parent | ba98026678ac956b97d01d4b7e5f7f326fb6e1c7 (diff) |
Versión 1.0.4, #526: Corregir errata al detectar la distribución de particiones.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@3123 a21b9725-9963-47de-94b9-378ad31fedc9
-rwxr-xr-x | admin/Interface/getConfiguration | 2 | ||||
-rwxr-xr-x | client/engine/Disk.lib | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/admin/Interface/getConfiguration b/admin/Interface/getConfiguration index e403286a..52147e94 100755 --- a/admin/Interface/getConfiguration +++ b/admin/Interface/getConfiguration @@ -7,7 +7,7 @@ #_______________________________________________________________________________________________________________________________ particiones=$(ogGetPartitionsNumber 1) # Incluir todas las particiones -cfg="1:0::::$(ogGetDiskSize 1);" # e información de disco (partición 0) +cfg="0::::$(ogGetDiskSize 1);" # e información de disco (partición 0) for ((par=1;par<=$particiones;par++)); do # Código del identificador de tipo de partición diff --git a/client/engine/Disk.lib b/client/engine/Disk.lib index 6f089668..87d79960 100755 --- a/client/engine/Disk.lib +++ b/client/engine/Disk.lib @@ -835,8 +835,10 @@ fi # Contar el nº de veces que aparece el disco en su lista de particiones. DISK=$(ogDiskToDev $1) 2>/dev/null -#sfdisk -l $DISK 2>/dev/null | grep -c "^$DISK" -grep -c "${DISK#/dev/}." /proc/partitions +case "$(ogGetPartitionTableType $1)" in + GPT) grep -c "${DISK#/dev/}." /proc/partitions ;; + MSDOS) sfdisk -l $DISK 2>/dev/null | grep -c "^$DISK" ;; +esac } |