A better version of the previous checkin. If the user specifies

a custom file that could override a FreeBSD file under a different
configuration, but doesn't under this one, give a different warning.

1 files changed, 9 insertions, 3 deletions

diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index a7df7ab..8f6f807 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -309,9 +309,15 @@ next:
 	else
 		isdup = 0;
 	tp = 0;
-	if (first == 3 && fl_lookup(this) == 0 && (tp = fltail_lookup(this)) != 0)
-		printf("%s: Local file %s overrides %s.\n",
-		    fname, this, tp->f_fn);
+	if (first == 3 && pf == 0 && (tp = fltail_lookup(this)) != 0) {
+		if (tp->f_type != INVISIBLE || tp->f_flags)
+			printf("%s: Local file %s overrides %s.\n",
+			    fname, this, tp->f_fn);
+		else
+			printf("%s: Local file %s could override %s"
+			    " with a different kernel configuration.\n",
+			    fname, this, tp->f_fn);
+	}
 	nreqs = 0;
 	special = 0;
 	depends = 0;