|
[-]
[+]
|
Changed |
_service:set_version:inventory-system.spec
|
|
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.rev1530.tar.bz2/client/inventory-system.sh
^
|
| @@ -1,8 +1,8 @@
#!/bin/bash
# Inventory System
# Author: Carsten Schoene
-# $LastChangedDate$
-# $Rev$
+# $LastChangedDate: 2012-07-06 21:46:15 +0200 (Fri, 06 Jul 2012) $
+# $Rev: 1530 $
#
# Default options (can be changed by inventory-system.conf)
DEBUG="yes"
@@ -149,7 +149,7 @@
INSTMEM=`${CAT} /proc/meminfo | ${GREP} "^MemTotal:" | ${AWK} '{print int($2/1024)}'`
;;
*)
- for MODULE in `${DMIDECODE} -t memory | ${GREP} "\s*Size" | ${GREP} -iv "No Module Installed" | ${AWK} '{print $(NF-1)}'`
+ for MODULE in `${DMIDECODE} -t memory | ${GREP} -E '\<Size:.*MB$' | ${GREP} -iv -E '(No Module Installed|Maximum)' | ${AWK} '{print $(NF-1)}'`
do
INSTMEM=`${EXPR} ${INSTMEM} + ${MODULE}`
done
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.rev1530.tar.bz2/server/isdf.php
^
|
| @@ -3,8 +3,8 @@
// isdf - inventory system deployment feed
// Author: Carsten Schoene
//
-// $LastChangedDate$
-// $Rev$
+// $LastChangedDate: 2012-07-06 21:46:15 +0200 (Fri, 06 Jul 2012) $
+// $Rev: 1530 $
*/
// define our name
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.rev1530.tar.bz2/server/status.php
^
|
| @@ -3,8 +3,8 @@
// isdf - inventory system webstatus
// Author: Carsten Schoene
//
-// $LastChangedDate$
-// $Rev$
+// $LastChangedDate: 2012-07-06 21:46:15 +0200 (Fri, 06 Jul 2012) $
+// $Rev: 1530 $
*/
// define our name
|
