diff options
| -rwxr-xr-x | admin/Interface/getConfiguration | 11 | ||||
| -rwxr-xr-x | client/engine/Disk.lib | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/admin/Interface/getConfiguration b/admin/Interface/getConfiguration index e8ef70c2..0a32905a 100755 --- a/admin/Interface/getConfiguration +++ b/admin/Interface/getConfiguration @@ -19,11 +19,11 @@ for ((par=1;par<=$particiones;par++)); do tam=$(ogGetPartitionSize 1 $par 2>/dev/null) tam=${tam:-"0"} # Sistema de fichero instalado - if [ $cod == 82 ]; then - soi=" " - else - soi=$(getOsVersion 1 $par 2>/dev/null | cut -f2 -d:) - fi + case "$cod" in + ""|82|8200|a502|bf02|ee|ef0[012]) + soi=" " ;; + *) soi=$(getOsVersion 1 $par 2>/dev/null | cut -f2 -d:) ;; + esac cfg="$cfg$par:$cod:$fsi:$soi:$tam;" done @@ -37,4 +37,3 @@ echo $cfg | awk '{ } }' - diff --git a/client/engine/Disk.lib b/client/engine/Disk.lib index 8c178466..de6861fe 100755 --- a/client/engine/Disk.lib +++ b/client/engine/Disk.lib @@ -420,7 +420,12 @@ fi # Detectar id. de tipo de partición y codificar al mnemónico. DISK=$(ogDiskToDev $1) || return $? -ID=$(sfdisk --id $DISK $2 2>/dev/null) || ogRaiseError $OG_ERR_NOTFOUND "$1,$2" || return $? +case "$(ogGetPartitionTableType $1)" in + GPT) ID=$(sgdisk -p $DISK 2>/dev/null | awk -v p="$2" '{if ($1==p) print $6;}') || ogRaiseError $OG_ERR_NOTFOUND "$1,$2" || return $? + # Falta definir tipo de caché local (CA00). + ;; + MSDOS) ID=$(sfdisk --id $DISK $2 2>/dev/null) || ogRaiseError $OG_ERR_NOTFOUND "$1,$2" || return $? ;; +esac echo $ID } |