diff options
author | ramon <ramongomez@us.es> | 2018-04-10 12:23:34 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2018-04-10 12:23:34 +0000 |
commit | 46b510c6b018ab1d94ae40d65425f87f98667c15 (patch) | |
tree | 61e701c206f2aaeff6cf2df7e91bcc517a2ad987 | |
parent | c30c33e93a905e5038fbd160bf89d5872ef82fb6 (diff) |
#802: Nueva función {{{ogIsEfiActive}}} y ampliar búsquedas de disco por UUID en función {{{ogDiskToDev}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5714 a21b9725-9963-47de-94b9-378ad31fedc9
-rwxr-xr-x | client/engine/Disk.lib | 2 | ||||
-rwxr-xr-x | client/engine/Inventory.lib | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/client/engine/Disk.lib b/client/engine/Disk.lib index 0b1a4c20..972da3da 100755 --- a/client/engine/Disk.lib +++ b/client/engine/Disk.lib @@ -408,6 +408,8 @@ fi DEV="$1" case "$DEV" in LABEL=*) DEV=$(blkid -L "${1#*=}") ;; + PARTLABEL=*) DEV=$(realpath "/dev/disk/by-partlabel/${1#*=}" 2>/dev/null) ;; + PARTUUID=*) DEV=$(realpath "/dev/disk/by-partuuid/${1#*=}" 2>/dev/null) ;; UUID=*) DEV=$(blkid -U "${1#*=}") ;; esac diff --git a/client/engine/Inventory.lib b/client/engine/Inventory.lib index 3450b3e5..c2861411 100755 --- a/client/engine/Inventory.lib +++ b/client/engine/Inventory.lib @@ -273,6 +273,16 @@ dmidecode -s system-serial-number | egrep -vi "(^[ 0]+$|not specified|filled by #/** +# ogIsEfiActive +#@brief Comprueba si el sistema tiene activo el arranque EFI. +#*/ ## +function ogIsEfiActive () +{ +test -d /sys/firmware/efi +} + + +#/** # ogListHardwareInfo #@brief Lista el inventario de hardware de la máquina cliente. #@return TipoDispositivo:Modelo (por determinar) |