|
 |
bc6b3f |
diff --git a/agent/mibgroup/host/hr_filesys.c b/agent/mibgroup/host/hr_filesys.c
|
|
|
bc6b3f |
index 4f78df3..fd25b3f 100644
|
|
|
bc6b3f |
--- a/agent/mibgroup/host/hr_filesys.c
|
|
|
bc6b3f |
+++ b/agent/mibgroup/host/hr_filesys.c
|
|
|
bc6b3f |
@@ -704,6 +704,7 @@ static const char *HRFS_ignores[] = {
|
|
|
bc6b3f |
"shm",
|
|
|
bc6b3f |
"sockfs",
|
|
|
bc6b3f |
"sysfs",
|
|
|
bc6b3f |
+ "tmpfs",
|
|
|
bc6b3f |
"usbdevfs",
|
|
|
bc6b3f |
"usbfs",
|
|
|
bc6b3f |
#endif
|
|
|
bc6b3f |
diff --git a/agent/mibgroup/host/hr_storage.c b/agent/mibgroup/host/hr_storage.c
|
|
|
bc6b3f |
index 6b459ec..f7a376b 100644
|
|
|
bc6b3f |
--- a/agent/mibgroup/host/hr_storage.c
|
|
|
bc6b3f |
+++ b/agent/mibgroup/host/hr_storage.c
|
|
|
bc6b3f |
@@ -540,9 +540,10 @@ really_try_next:
|
|
|
bc6b3f |
|
|
|
bc6b3f |
store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
|
|
|
bc6b3f |
if (store_idx > NETSNMP_MEM_TYPE_MAX ) {
|
|
|
bc6b3f |
- if ( netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
|
|
|
bc6b3f |
+ if ( (netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
|
|
|
bc6b3f |
NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
|
|
|
bc6b3f |
- Check_HR_FileSys_NFS())
|
|
|
bc6b3f |
+ Check_HR_FileSys_NFS()) ||
|
|
|
bc6b3f |
+ Check_HR_FileSys_AutoFs())
|
|
|
bc6b3f |
return NULL; /* or goto try_next; */
|
|
|
bc6b3f |
if (Check_HR_FileSys_AutoFs())
|
|
|
bc6b3f |
return NULL;
|
|
|
bc6b3f |
diff --git a/agent/mibgroup/host/hrh_storage.c b/agent/mibgroup/host/hrh_storage.c
|
|
|
bc6b3f |
index 8967d35..9bf2659 100644
|
|
|
bc6b3f |
--- a/agent/mibgroup/host/hrh_storage.c
|
|
|
bc6b3f |
+++ b/agent/mibgroup/host/hrh_storage.c
|
|
|
bc6b3f |
@@ -366,9 +366,10 @@ really_try_next:
|
|
|
bc6b3f |
store_idx = name[ HRSTORE_ENTRY_NAME_LENGTH ];
|
|
|
bc6b3f |
if (HRFS_entry &&
|
|
|
bc6b3f |
store_idx > NETSNMP_MEM_TYPE_MAX &&
|
|
|
bc6b3f |
- netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
|
|
|
bc6b3f |
+ ((netsnmp_ds_get_boolean(NETSNMP_DS_APPLICATION_ID,
|
|
|
bc6b3f |
NETSNMP_DS_AGENT_SKIPNFSINHOSTRESOURCES) &&
|
|
|
bc6b3f |
- Check_HR_FileSys_NFS())
|
|
|
bc6b3f |
+ Check_HR_FileSys_NFS()) ||
|
|
|
bc6b3f |
+ Check_HR_FileSys_AutoFs()))
|
|
|
bc6b3f |
return NULL;
|
|
|
bc6b3f |
if (HRFS_entry && Check_HR_FileSys_AutoFs())
|
|
|
bc6b3f |
return NULL;
|