diff options
| author | ramon <ramongomez@us.es> | 2015-04-20 10:56:54 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2015-04-20 10:56:54 +0000 |
| commit | 1a2fa9d82bafd3ef8e0d703bf715fe3e58853d0d (patch) | |
| tree | 1e008f200ff4b413d0807eee03df75ef42f39fab /client/engine/Inventory.lib | |
| parent | c916af9faafcd8fa120aeaf9092c0847aa09183a (diff) | |
#673: Actualizar código incluido en OepnGnSys 1.0.6 sobre la rama {{{version1.1}}} para desarrollar la nueva versión.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4609 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/Inventory.lib')
| -rwxr-xr-x | client/engine/Inventory.lib | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/client/engine/Inventory.lib b/client/engine/Inventory.lib index 03e9b589..4cbdcabb 100755 --- a/client/engine/Inventory.lib +++ b/client/engine/Inventory.lib @@ -68,7 +68,7 @@ ogGetOsVersion "$@" | cut -sf1 -d: #@version 1.0.5 - Incluir tipos GrubLoader, Hurd y WinLoader, leer por defecto fichero /etc/os-release. #@author Ramon Gomez, ETSII Universidad de Sevilla #@date 2013-10-07 -#@version 1.0.6 - Detectar GrubLoader al final. +#@version 1.0.6 - Detectar GrubLoader al final y sistemas basados en EFI. #@author Ramon Gomez, ETSII Universidad de Sevilla #@date 2014-08-27 #*/ ## @@ -133,12 +133,11 @@ fi if [ -z "$VERSION" ]; then TYPE="WinLoader" FILE="$(ogGetPath $MNTDIR/boot/bcd)" + [ -z "$FILE" ] && FILE="$(ogGetPath $MNTDIR/EFI/Microsoft/boot/bcd)" if [ -n "$FILE" ]; then - for DISTRIB in "Windows 8" "Windows 7" "Windows Vista" \ - "Windwos Server 2008" "Windwos Server 2008 R2" \ - "Windwos Recovery Environment"; do + for DISTRIB in "Windows Recovery" "Windows Boot"; do if grep -qs "$(echo "$DISTRIB" | sed 's/./&./g')" $FILE; then - VERSION="$DISTRIB loader" + VERSION="$DISTRIB loader" fi done fi |