Merge pull request #2729 from davehope/master

Create zyxelgs.inc.php

includes/definitions.inc.php

@@ -947,7 +947,7 @@ $config['os'][$os]['text'] = 'ZyXEL Prestige';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'zyxel';
 
-$os = 'zyxeles';
+$os = 'zynos';
 $config['os'][$os]['text'] = 'ZyXEL Ethernet Switch';
 $config['os'][$os]['type'] = 'network';
 $config['os'][$os]['icon'] = 'zyxel';

includes/discovery/os/zynos.inc.php

@@ -0,0 +1,5 @@
+<?php
+if (!$os) {
+	if (strstr($sysObjectId, '.1.3.6.1.4.1.890') && preg_match('/^(ES|GS)/', $sysDescr))
+		$os = 'zynos';
+}

includes/discovery/os/zyxeles.inc.php

@@ -1,7 +0,0 @@
-<?php
-
-if (!$os) {
-    if (preg_match('/^ES-/', $sysDescr)) {
-        $os = 'zyxeles';
-    }
-}