Changes of Revision 33
| [-] | Changed | _service:set_version:ix-inventory-system.spec |
|
1 2 %define pkgname inventory-system3 Name: ix-inventory-system4 Release: 05 -Version: 0.0.95486 +Version: 0.0.95507 Url: http://www.internetx.com/8 License: GPLv29 Group: System10 |
||
| [+] | Changed | _service:recompress:tar_scm:inventory-system-0.0.9550.tar.bz2/client/inventory-system.sh ^ |
| @@ -1,8 +1,8 @@ #!/usr/bin/env bash # Inventory System # Author: Carsten Schoene -# $LastChangedDate: 2014-11-28 14:35:12 +0100 (Fri, 28 Nov 2014) $ -# $Rev: 9548 $ +# $LastChangedDate: 2014-11-28 15:44:14 +0100 (Fri, 28 Nov 2014) $ +# $Rev: 9550 $ # # Default options (can be changed by inventory-system.conf) DEBUG="yes" @@ -365,6 +365,9 @@ function get_system_cpu { [ "`is_disabled $FUNCNAME`" == "1" ] && return CPU=`${LSHW} -quiet -C processor | ${GREP} "product:" | ${SORT} -u | ${AWK} -F"product: " '{ print $NF}' | ${HEAD} -n1 | ${SED} -e 's@\s\+@ @g'` + if [ -n "`echo ${CPU} | ${GREP} -i -E '(O.E.M.|OEM)'`" ] ; then + CPU=`${LSHW} -quiet -C processor | ${GREP} "version:" | ${SORT} -u | ${AWK} -F"version: " '{ print $NF}' | ${HEAD} -n1 | ${SED} -e 's@\s\+@ @g'` + fi debug "SYSTEM-CPU: ${CPU}" echo ${CPU} } @@ -399,10 +402,10 @@ ;; kvm) ROOTDEV=`${READLINK} -f /dev/root` - if [ -z "${ROOTDEV}" ] ; then + if [ -z "${ROOTDEV}" ] || [ ! -e "${ROOTDEV}" ] ; then if [ -d /dev/disk/by-uuid/ ] ; then UUID=`${GREP} -E '(^UUID=.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^UUID=(.*)\s/\s.*@\1@'` - ROOTDDEV=`${READLINK} -e $(${LS} -1A /dev/disk/by-uuid/${UUID})` + ROOTDEV=`${READLINK} -e $(${LS} -1A /dev/disk/by-uuid/${UUID})` else ROOTDEV=`${GREP} -E '(^/dev/.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^(/dev/x?[hsv]d[a-z].*)\s/\s.*@\1@'` fi @@ -428,7 +431,7 @@ ;; *) ROOTDEV=`${READLINK} -f /dev/root` - if [ -z "${ROOTDEV}" ] ; then + if [ -z "${ROOTDEV}" ] || [ ! -e "${ROOTDEV}" ] ; then UUID=`${GREP} -E '(^UUID=.*\s/\s.*)' /etc/fstab | ${SED} -r 's@^UUID=(.*)\s/\s.*@\1@'` ROOTDEV=`${READLINK} -e $(${LS} -1A /dev/disk/by-uuid/${UUID})` else | ||
| [+] | Changed | _service:set_version:debian.changelog ^ |
| @@ -1,4 +1,4 @@ -ix-inventory-system (0.0.9548) stable; urgency=low +ix-inventory-system (0.0.9550) stable; urgency=low * Initial Release | ||
| [+] | Changed | _service:set_version:ix-inventory-system.dsc ^ |
| @@ -2,7 +2,7 @@ Source: ix-inventory-system Binary: ix-inventory-system Architecture: any -Version: 0.0.9548 +Version: 0.0.9550 Maintainer: Carsten Schoene <cs@linux-administrator.com> Standards-Version: 0.0.1 Build-Depends: cdbs, cmake, debhelper | ||