summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2017-06-20 16:33:45 +0000
committerramon <ramongomez@us.es>2017-06-20 16:33:45 +0000
commit1e25374e0661bd1b8e5d71b1e3db50f0b8204c04 (patch)
treed14caafabd9a8023452b4bf8a005783ca584555c /client
parent341cb58f6ee20e73c3a667a2381de0473e499d69 (diff)
#790: Obtener cuando sea posible salida ordenada del comando {{{lsblk}}}, solucionando el problema con la versión de Ubuntu 16.04.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5368 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 702bd7fb..8c85488f 100755
--- a/client/engine/Disk.lib
+++ b/client/engine/Disk.lib
@@ -485,8 +485,8 @@ fi
# Continuar para detectar nuevos dispositivos.
# Listar dispositivos de discos.
-ALLDISKS=$(lsblk -n -e 1,2 | awk '$6~/^disk$/ {gsub(/!/,"/"); printf "/dev/%s ",$1}')
-
+ALLDISKS=$((lsblk -n -e 1,2 -x MAJ:MIN 2>/dev/null || lsblk -n -e 1,2) | \
+ awk '$6~/^disk$/ {gsub(/!/,"/"); printf "/dev/%s ",$1}')
# Listar volúmenes lógicos.
VOLGROUPS=$(vgs -a --noheadings 2>/dev/null | awk '{printf "/dev/%s ",$1}')
ALLDISKS="$ALLDISKS $VOLGROUPS"