MFC the HOSTRES-MIB. This is exactly the same version as in HEAD except for

a slightly different mechanism to load geom_md (g_me) which was renamed at
some point. This has been tested on RELENG_6 by erwin and glebius.

Reviewed by:	erwin, glebius

usr.sbin/bsnmpd/modules/Makefile

@@ -7,6 +7,7 @@ _snmp_atm= snmp_atm
 .endif
 
 SUBDIR=	${_snmp_atm} \
+	snmp_hostres \
 	snmp_mibII \
 	snmp_netgraph \
 	snmp_pf

usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c

@@ -133,9 +133,10 @@ mdmaybeload(void)
 	snprintf(name2, sizeof(name2), "geom_%s", MD_NAME);
 	if (modfind(name1) == -1) {
 		/* Not present in kernel, try loading it. */
-		if (kldload(name2) == -1 || modfind(name1) == -1) {
+		if ((kldload(name2) == -1 || modfind(name1) == -1) &&
+		    (kldload(name1) == -1 || modfind(name1) == -1)) {
 			if (errno != EEXIST) {
-				errx(EXIT_FAILURE,
+				syslog(LOG_WARNING,
 				    "%s module not available!", name2);
 			}
 		}