|
[-]
[+]
|
Changed |
_service:set_version:inventory-system.spec
|
|
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.rev1761.tar.bz2/client/inventory-system.sh
^
|
| @@ -1,8 +1,8 @@
#!/bin/bash
# Inventory System
# Author: Carsten Schoene
-# $LastChangedDate: 2012-09-10 17:01:13 +0200 (Mon, 10 Sep 2012) $
-# $Rev: 1757 $
+# $LastChangedDate: 2012-09-10 17:26:03 +0200 (Mon, 10 Sep 2012) $
+# $Rev: 1761 $
#
# Default options (can be changed by inventory-system.conf)
DEBUG="yes"
@@ -327,7 +327,7 @@
RD=${BL_ROOTDISK}
fi
# / 1000 nicht / 1024 bei physikalischen Festplatten
- SIZE=`LANG=C ${FDISK} -l ${RD} 2>/dev/null | ${GREP} "^Disk /" | ${AWK} '{print $(NF-1)/1000/1000 }'`
+ SIZE=`LANG=C ${FDISK} -l ${RD} 2>/dev/null | ${GREP} "^Disk /" | ${AWK} '{print int($(NF-1)/1000/1000) }'`
debug "SYSTEM-ROOT-DEV: ${RD}"
debug "SYSTEM-ROOTDEV-SIZE: ${SIZE}"
echo ${SIZE}
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.rev1761.tar.bz2/server/isdf.php
^
|
| @@ -3,8 +3,8 @@
// isdf - inventory system deployment feed
// Author: Carsten Schoene
//
-// $LastChangedDate: 2012-08-11 16:22:17 +0200 (Sat, 11 Aug 2012) $
-// $Rev: 1690 $
+// $LastChangedDate: 2012-09-10 17:22:56 +0200 (Mon, 10 Sep 2012) $
+// $Rev: 1760 $
*/
// define our name
@@ -34,7 +34,7 @@
// function valid_uuid
function valid_uuid ( $uuid ) {
$uuid = trim($uuid);
- $regex = '/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}/';
+ $regex = '/[A-F0-9]{8}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{4}-[A-F0-9]{12}/';
if ( strlen($uuid) == 36 && preg_match($regex,$uuid) ) {
return true;
} else {
|
