|
[-]
[+]
|
Changed |
_service:set_version:ix-inventory-system.spec
|
|
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.8738.tar.bz2/SUPPORTED_OS
^
|
| @@ -1,13 +1,17 @@
* client side tested operating systems
CentOS 5.x
CentOS 6.x
+CentOS 7.x
Citrix XenServer 6.x
Debian 6.x
Debian 7.x
RHEL 5.x
RHEL 6.x
+RHEL 7.x
openSUSE 12.1
openSUSE 12.2
+openSUSE 12.3
+openSUSE 13.1
SUSE Linux Enterprise 10
SUSE Linux Enterprise 11
Ubuntu 12.04.x
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.8738.tar.bz2/client/inventory-system.sh
^
|
| @@ -1,8 +1,8 @@
#!/usr/bin/env bash
# Inventory System
# Author: Carsten Schoene
-# $LastChangedDate: 2013-10-07 23:21:59 +0200 (Mon, 07 Oct 2013) $
-# $Rev: 6708 $
+# $LastChangedDate: 2014-07-11 13:23:27 +0200 (Fri, 11 Jul 2014) $
+# $Rev: 8738 $
#
# Default options (can be changed by inventory-system.conf)
DEBUG="yes"
@@ -18,6 +18,7 @@
id
sed
grep
+find
sort
tail
head
@@ -241,7 +242,7 @@
elif [ -n "${ZYPPER}" ] && [ -f /etc/SuSE-release ] ; then
REL=`${LSB_RELEASE} -r | ${AWK} '{print $NF}'`
case ${REL} in
- 11|11.1|11.2|11.3|11.4|12.1|12.2|12.3)
+ 11|11.1|11.2|11.3|11.4|12.1|12.2|12.3|13.1)
CUPD="`${ZYPPER} -q lu | ${GREP} ${PKG}`"
if [ -n "${CUPD}" ] ; then
${ZYPPER} -q -n update ${PKG}
@@ -314,7 +315,11 @@
[ "`is_disabled $FUNCNAME`" == "1" ] && return
MAC=${1}
debug ${MAC}
- ${IFCONFIG} -a | ${GREP} -i ${MAC} | ${AWK} '{print $1}' | ${HEAD} -n1
+ if [ -d /sys/class/net ] ; then
+ ${FIND} -L /sys/class/net -maxdepth 2 -name address -exec ${GREP} -iH ${MAC} {} \; 2>/dev/null | ${AWK} -F/ '{print $5}' | ${HEAD} -n1
+ else
+ ${IFCONFIG} -a | ${GREP} -i ${MAC} | ${AWK} '{print $1}' | ${HEAD} -n1
+ fi
}
# get link state for interface from ethtool
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.8738.tar.bz2/contrib/inventory.php
^
|
| @@ -4,7 +4,7 @@
// 2012-11-08 - Carsten Schoene <cs@linux-administrator.com>
-// http://carsten .schoene.cc/
+// http://carsten.schoene.cc/
# Settings
@@ -79,13 +79,6 @@
function htmlStyles () {
echo '
- <script type="text/javascript">
- function popup (url) {
- popup = window.open(url, "Icinga", "width=1024,height=800,resizable=yes");
- popup.focus();
- return false;
- }
- </script>
<style type="text/css">
.status { font-family: arial,serif; background-color: white; color: black; }
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.8738.tar.bz2/server/config.inc.php
^
|
| @@ -1,6 +1,6 @@
<?php
-$config["isdf"]["postvars"] = array("get_system_uuid","get_system_serial","get_system_cpu","get_system_memory","get_system_manufacturer","get_system_productname","get_system_biosversion","get_system_net_info","get_system_default_ip","get_system_ipv4","get_system_ipv6","get_system_hostname","get_system_mgmt_mac","get_system_mgmt_ip","get_system_mgmt_firmware","get_system_type","get_system_kernelversion","get_system_arch","get_system_os","get_system_software","get_system_date","get_system_disk_size_bootdev","get_system_disk_sizes","get_system_dell_express_service_code");
+$config["isdf"]["postvars"] = array("get_system_uuid","get_system_serial","get_system_cpu","get_system_memory","get_system_manufacturer","get_system_productname","get_system_biosversion","get_system_net_info","get_system_default_ip","get_system_ipv4","get_system_ipv6","get_system_hostname","get_system_mgmt_mac","get_system_mgmt_ip","get_system_mgmt_firmware","get_system_type","get_system_kernelversion","get_system_arch","get_system_os","get_system_software","get_system_date","get_system_disk_size_bootdev","get_system_disk_sizes","get_system_dell_express_service_code","get_baseboard_manufacturer","get_baseboard_productname","get_system_virtual_guests");
$config["isdf"]["dhcp"]["macblacklist"] = array("00:00:00:00:00:00","ff:ff:ff:ff:ff:ff");
$config["isdf"]["dhcp"]["intblacklist"] = array("virbr0");
|
|
[-]
[+]
|
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.6711
+Version: 0.0.8738
Maintainer: Carsten Schoene <cs@linux-administrator.com>
Standards-Version: 0.0.1
Build-Depends: cdbs, cmake, debhelper
|
