set all unix-like stuff to server, and remove old linux handling (quicker than you, failwindr :)

git-svn-id: http://www.observium.org/svn/observer/trunk@1707 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-09-17 21:30:39 +00:00
parent 9bd38c24c8
commit 46ffe27b2d
2 changed files with 9 additions and 5 deletions

View File

@ -158,11 +158,6 @@ while ($device = mysql_fetch_array($device_query))
{
$device['type'] = $config['os'][$device['os']]['type'];
}
if ($device['os'] == "linux")
{
if (preg_match("/-server$/", $device['version'])) { $device['type'] = 'server'; }
}
}
$device_end = utime(); $device_run = $device_end - $device_start; $device_time = substr($device_run, 0, 5);

View File

@ -16,27 +16,33 @@ $os = "generic";
$config['os'][$os]['text'] = "Generic Device";
$os = "linux";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Linux";
$config['os'][$os]['ifXmcbc'] = 1;
$os = "freebsd";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "FreeBSD";
$os = "openbsd";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "OpenBSD";
$os = "netbsd";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "NetBSD";
$os = "dragonfly";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "DragonflyBSD";
$os = "netware";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['text'] = "Novell Netware";
$config['os'][$os]['icon'] = "novell";
@ -52,6 +58,7 @@ $config['os'][$os]['over'][1]['text'] = "CPU Usage";
$os = "solaris";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Sun Solaris";
$config['os'][$os]['type'] = "server";
$os = "adva";
$config['os'][$os]['type'] = "network";
@ -60,10 +67,12 @@ $config['os'][$os]['over'][0]['graph'] = "device_bits";
$config['os'][$os]['over'][0]['text'] = "Device Traffic";
$os = "opensolaris";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Sun OpenSolaris";
$os = "openindiana";
$config['os'][$os]['type'] = "server";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "OpenIndiana";