summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2016-05-11 12:43:07 +0000
committerramon <ramongomez@us.es>2016-05-11 12:43:07 +0000
commit880b7fad069d0828b61d0785b9f94e49b4e9a3fa (patch)
tree13d292e6be9cc27220eb4519e78fbf1a3314175c /client
parentfa93b79853f4ce83739a8438c207aed69cf6d637 (diff)
#730: Mejorar el rendimiento de la función {{{ogGetPartitionTableType}}} sustituyendo {{{parted}}} por {{{blkid}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4923 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
-rwxr-xr-xclient/engine/Disk.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/engine/Disk.lib b/client/engine/Disk.lib
index 5937a915..ea05eb24 100755
--- a/client/engine/Disk.lib
+++ b/client/engine/Disk.lib
@@ -852,7 +852,7 @@ esac
#@version 1.0.6 - Soportar LVM.
#@author Universidad de Huelva
#@date 2014-09-04
-#@version 1.1.0 - Soportar ZFS.
+#@version 1.1.0 - Mejorar rendimiento y soportar ZFS.
#@author Ramon Gomez, ETSII Universidad Sevilla
#@date 2014-11-14
#*/ ##
@@ -874,7 +874,7 @@ fi
DISK=$(ogDiskToDev $1) || return $?
# Comprobar tabla de particiones.
-[ -b $DISK ] && TYPE=$(parted -sm $DISK print 2>/dev/null | awk -F: -v D=$DISK '{ if($1 == D) print toupper($6)}')
+[ -b $DISK ] && TYPE=$(blkid -s PTTYPE -o value $DISK | awk '{ if($1=="dos") print "MSDOS"; else print toupper($1)}')
# Comprobar si es volumen lógico.
[ -d $DISK ] && vgs $DISK &>/dev/null && TYPE="LVM"
# Comprobar si es pool de ZFS.