summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authoririna <irinagomez@us.es>2015-11-18 09:20:36 +0000
committeririna <irinagomez@us.es>2015-11-18 09:20:36 +0000
commit8df5ab7bf61f3bffd88ffdad6874e74bd7d10ced (patch)
tree1985afffb65160a163ae29dc1eb817a7fc27f653 /client
parentc7dcb94136929cfd1d4ffd4bb384f28397b895c0 (diff)
#727 fdisk se usa para comprobar las particiones de Windows
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4739 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
-rwxr-xr-xclient/engine/Boot.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib
index 5f517c78..e134f342 100755
--- a/client/engine/Boot.lib
+++ b/client/engine/Boot.lib
@@ -1109,7 +1109,7 @@ function ogGrubHidePartitions {
[ -r $GRUBGFC ] || return $(ogRaiseError log session $OG_ERR_NOTFOUND "$GRUBGFC" 1>&2; echo $?)
# Si solo hay una particion de Windows me salgo
- [ $(blkid | grep 'ntfs' |wc -l) -eq 1 ] && return 0
+ [ $(fdisk -l $(ogDiskToDev $1) | grep 'NTFS' |wc -l) -eq 1 ] && return 0
# Elimino llamadas a parttool, se han incluido en otras ejecuciones de esta funcion.
sed -i '/parttool/d' $GRUBGFC
@@ -1119,7 +1119,7 @@ function ogGrubHidePartitions {
# Entradas de Windows: numero de linea y particion. De mayor a menor.
WINENTRY=$(awk '/menuentry.*Windows/ { gsub(/\/dev\/sda/,""); gsub(/\)\"/, ""); print NR":"$6} ' $GRUBGFC | sed '1!G;h;$!d' )
# Particiones de Windows, pueden no estar en el grub.
- WINPART=$(blkid|awk '/ntfs/ {print substr($1,9,1)}' |sed '1!G;h;$!d')
+ WINPART=$(fdisk -l $(ogDiskToDev $1)|awk '/NTFS/ {print substr($1,9,1)}' |sed '1!G;h;$!d')
# Modifico todas las entradas de Windows.
for ENTRY in $WINENTRY; do
LINE=${ENTRY%:*}