From 0897f33cba1e9d96efce0197eb5eaaf9905b007b Mon Sep 17 00:00:00 2001 From: f0o Date: Sun, 9 Mar 2014 19:05:34 +0100 Subject: [PATCH 1/3] Added logo for Gentoo Linux --- html/images/os/gentoo.png | Bin 0 -> 1905 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 html/images/os/gentoo.png diff --git a/html/images/os/gentoo.png b/html/images/os/gentoo.png new file mode 100644 index 0000000000000000000000000000000000000000..c9f69304db3e4792186c8637ad13868bb8face8d GIT binary patch literal 1905 zcmV-%2afoOP)JqCB2a3B_ydT^;e`)U;PvM z(Dzmqt<+SJD%vV)l|Cd*9Lv<9T$0#k#x}lT8{@g2`#Ed%VFqKHX+!tRc{=<1zO}!# zzJ<&TtqwCY6EoLpQKb|FKBE$LTDG?vrY-;x5djds?O-baX67i2XTC1a%{x*vt&}Oy z2qSVG3S+N3ub&vuyYeZ71_b^e07S%`6lb?)zVZ6{I}RU7B_x9od=CR3d>21%N~t_~g0ZxafQ6`w;l-`dlhUZoPJ5 zKtFRfrD+oX3&v9bW{9HblYh*0bsZQwmqrxZ|1h)ff$O5{u;YT~K@gxHvgdNC?Aw+< zGMeh#Z?wc{0yG|U{F8!h?;pOClS_I#TVjeB>}K}67XOl8PUgKnU%gQlU9AQfiQX3EM;+)Spv ztS8A{%c#c3_x-Q#l`mg8DW!Z?rsu}MaBrr(@hCogDARqw6cVCD#4$<+O29A`i0t%? z<9W4_i#9yFt^ds-nFlNPi30o3I!w)OinIJDBqg$x(@Wbb@faXQ4|SDNRo+A z)4;av#U&re8yQtf;jR*GZ917Y9gzWA^j#2e@xIb!CGo$u#O#CO&6|^p9qlM3C;4L2%}Fwz1?%IzvZ}wTD3Ou`BbIU_R0?ib2)Q&TY&G8=b`6; z?{gGk6aghbgiH)by?v}1$#1XUd$eBo#n0bTt-=624;Xu2yLvF2)msG-05=s#3Cv80 z%#6qf522ya^$+eYFU(%P)Mr}yUH~FmSt{TE#ue*ZzCvbA=s-@5YZIYgm$ks~PHf3&(7jlR;Y>#~(Nqy(6l839;GRKP@RnAF+H z8(Z#;8->VQ&KlmecdqKX@pRZVid&d{xVl6aFLfJ+Y?aawN07uo)HJ0)Kn0ct?H&Bp zbop<8pEl%{67_38`B5g*j0d&NZE@kzTp|4a>xT_pJbO6+Qi4eW2>~$zfJ6|AEQ@uM zKl*rnW_lgsl}tvx{qCD>ZRzca*#O{5rGER%(#ZFYY8o)}&TMMDDkTud5Jwy*z>EN( z6xdm;RQ%ulp%{f#&ne_{`g=cp!?w+xzc<@MG1^XL1oUcICn3Q_D0oO;bEZN|q3Y|lj{SxQC$PjU^2 zfEk!LAz)@H!A?V^n*8~rh0V?NxVE(T@WH$9ygo8IjELLg`6&Pqt*t$lnh_HO9>xlV zKp}WH4twJGU&!Gc<`tZZi zmveGUWiwVIMi2oJh(Kwv<2uEEZx!b^lDMvtauls27}wtW;lRmWDb@d89TfoN^ZUE< z_UGdt4-H?+cXnz@mqGx7>$&TXOACujz8jcYps;30C!%0zXz Date: Mon, 10 Mar 2014 03:18:56 -0700 Subject: [PATCH 2/3] Re-do of pfsense commit --- includes/discovery/os/freebsd.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/includes/discovery/os/freebsd.inc.php b/includes/discovery/os/freebsd.inc.php index 9ebea197a..d57d9e27e 100755 --- a/includes/discovery/os/freebsd.inc.php +++ b/includes/discovery/os/freebsd.inc.php @@ -2,9 +2,10 @@ if (!$os) { - if (strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; } // It's FreeBSD! - if (strstr($sysDescr, "Voswall")) { $os = "voswall"; } // Oh-No-It-Isn't!! - if (strstr($sysDescr, "m0n0wall")) { $os = "monowall"; } // Ditto + if (strstr($sysDescr, "Voswall")) { $os = "voswall"; } // Oh-No-It-Isn't!! + else if (strstr($sysDescr, "m0n0wall")) { $os = "monowall"; } // Ditto + else if (strstr($sysDescr, "pfSense")) { $os = "pfsense"; } + else if (strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; } // It's FreeBSD! } -?> \ No newline at end of file +?> From f7ae7c4ed60f343fb8649491d541a55e62540378 Mon Sep 17 00:00:00 2001 From: Greg Date: Mon, 10 Mar 2014 13:48:25 -0700 Subject: [PATCH 3/3] Fixes issue #185 --- includes/definitions.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 9e99b41b7..47d65fa0d 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -560,6 +560,12 @@ $os = "engenius"; $config['os'][$os]['type'] = "wireless"; $config['os'][$os]['text'] = "EnGenius Access Point"; $config['os'][$os]['icon'] = "engenius"; +$config['os'][$os]['over'][0]['graph'] = "device_ucd_cpu"; +$config['os'][$os]['over'][0]['text'] = "Processor Usage"; +$config['os'][$os]['over'][1]['graph'] = "device_ucd_memory"; +$config['os'][$os]['over'][1]['text'] = "Memory Usage"; +$config['os'][$os]['over'][2]['graph'] = "device_bits"; +$config['os'][$os]['over'][2]['text'] = "Device Traffic"; $os = "airport"; $config['os'][$os]['type'] = "wireless";