diff options
| author | ramon <ramongomez@us.es> | 2016-05-06 11:21:15 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2016-05-06 11:21:15 +0000 |
| commit | 1e4000f10ca0e35f2ab98940afcf66c0e2bd4186 (patch) | |
| tree | c269c97cda0c60d31dd593c4d5bfbfd37aad1814 /client | |
| parent | ccf1fa06757ae62984d303258b6982afae6642a5 (diff) | |
#724 #731: Adaptar función {{{ogGetOsVersion}}} a ogLive basada en Ubuntu 15.10; detección más sencilla en función {{{ogWindowsBootParameters}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4921 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client')
| -rwxr-xr-x | client/engine/Boot.lib | 2 | ||||
| -rwxr-xr-x | client/engine/Inventory.lib | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/engine/Boot.lib b/client/engine/Boot.lib index 4495164c..dc9158f0 100755 --- a/client/engine/Boot.lib +++ b/client/engine/Boot.lib @@ -487,7 +487,7 @@ PART=$2 FILE=/tmp/temp$$ # Obtener versión de Windows. -WINVER=$(ogGetOsVersion $1 $2 | awk -F"[: ]" '$2=="Windows" {if ($3=="Server" || $3=="Recovery") print $2,$3,$4; else print $2,$3;}') +WINVER=$(ogGetOsVersion $1 $2 | awk -F"[: ]" '$1=="Windows" {if ($3=="Server") print $2,$3,$4; else print $2,$3;}') [ -z "$WINVER" ] && return $(ogRaiseError $OG_ERR_NOTOS "Windows"; echo $?) # Acciones para Windows XP. diff --git a/client/engine/Inventory.lib b/client/engine/Inventory.lib index 410691bf..9a733558 100755 --- a/client/engine/Inventory.lib +++ b/client/engine/Inventory.lib @@ -178,7 +178,7 @@ if [ -z "$VERSION" ]; then [ -z "$FILE" ] && FILE="$(ogGetPath $MNTDIR/EFI/Microsoft/boot/bcd)" if [ -n "$FILE" ]; then for DISTRIB in "Windows Recovery" "Windows Boot"; do - if grep -qs "$(echo "$DISTRIB" | sed 's/./&./g')" $FILE; then + if grep -aqs "$(echo "$DISTRIB" | sed 's/./&./g')" $FILE; then VERSION="$DISTRIB loader" fi done |