From: Roy Marples <roy@marples.name>
Date: Wed, 7 Oct 2020 13:23:23 +0000 (+0100)
Subject: if: always log about unsupported interface types in debug
X-Git-Tag: v9.3.1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2caea689681e9e2f9291290939390ea7d12b2f9;p=thirdparty%2Fdhcpcd.git

if: always log about unsupported interface types in debug
---

diff --git a/src/if.c b/src/if.c
index d21625ef..9b460797 100644
--- a/src/if.c
+++ b/src/if.c
@@ -422,11 +422,14 @@ if_check_arphrd(struct interface *ifp, unsigned int active, bool if_noconf)
 		}
 		break;
 	default:
-		if (if_noconf)
-			active = IF_INACTIVE;
-		if (active)
-			logwarnx("%s: unsupported interface type 0x%.2x",
-			    ifp->name, ifp->hwtype);
+		if (active) {
+			if (if_noconf)
+				active = IF_INACTIVE;
+			i = active ? LOG_WARNING : LOG_DEBUG;
+			logmessage(i, "%s: unsupported"
+			    " interface type 0x%.2x",
+			    ifp->name, ifp->hw_type);
+		}
 		break;
 	}
 
@@ -632,12 +635,14 @@ if_discover(struct dhcpcd_ctx *ctx, struct ifaddrs **ifaddrs,
 #endif
 			default:
 				/* Don't allow unless explicit */
-				if (if_noconf)
-					active = IF_INACTIVE;
-				if (active)
-					logwarnx("%s: unsupported"
+				if (active) {
+					if (if_noconf)
+						active = IF_INACTIVE;
+					i = active ? LOG_WARNING : LOG_DEBUG;
+					logmessage(i, "%s: unsupported"
 					    " interface type 0x%.2x",
 					    ifp->name, sdl->sdl_type);
+				}
 				/* Pretend it's ethernet */
 				ifp->hwtype = ARPHRD_ETHER;
 				break;