From 35bea945ba8045df78cd831919d6a961a60f94cd Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 4 Nov 2022 23:12:56 -0500
Subject: [PATCH] SnmpQuery fix mib directory order (#14580)

---
 LibreNMS/Data/Source/NetSnmpQuery.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/LibreNMS/Data/Source/NetSnmpQuery.php b/LibreNMS/Data/Source/NetSnmpQuery.php
index ab94ff917c..129be22ac5 100644
--- a/LibreNMS/Data/Source/NetSnmpQuery.php
+++ b/LibreNMS/Data/Source/NetSnmpQuery.php
@@ -420,13 +420,6 @@ class NetSnmpQuery implements SnmpQueryInterface
         $base = Config::get('mib_dir');
         $dirs = [$base];
 
-        // os directory
-        if ($os_mibdir = Config::get("os.{$this->device->os}.mib_dir")) {
-            $dirs[] = "$base/$os_mibdir";
-        } elseif (file_exists($base . '/' . $this->device->os)) {
-            $dirs[] = $base . '/' . $this->device->os;
-        }
-
         // os group
         if ($os_group = Config::get("os.{$this->device->os}.group")) {
             if (file_exists("$base/$os_group")) {
@@ -434,6 +427,13 @@ class NetSnmpQuery implements SnmpQueryInterface
             }
         }
 
+        // os directory
+        if ($os_mibdir = Config::get("os.{$this->device->os}.mib_dir")) {
+            $dirs[] = "$base/$os_mibdir";
+        } elseif (file_exists($base . '/' . $this->device->os)) {
+            $dirs[] = $base . '/' . $this->device->os;
+        }
+
         if ($this->mibDir) {
             $dirs[] = "$base/$this->mibDir";
         }