Enforce COMPAT_DF12 for now, this can be overriden via NO_COMPAT_DF12
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 2 Aug 2005 13:18:25 +0000 (13:18 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Tue, 2 Aug 2005 13:18:25 +0000 (13:18 +0000)
from the environment.

Revert-after: 1 month

usr.sbin/config/mkoptions.c

index 093eef9..7d1dd9d 100644 (file)
@@ -33,7 +33,7 @@
  *
  * @(#)mkheaders.c     8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/config/mkoptions.c,v 1.17.2.3 2001/12/13 19:18:01 dillon Exp $
- * $DragonFly: src/usr.sbin/config/mkoptions.c,v 1.14 2005/01/12 00:26:03 cpressey Exp $
+ * $DragonFly: src/usr.sbin/config/mkoptions.c,v 1.15 2005/08/02 13:18:25 joerg Exp $
  */
 
 /*
@@ -139,6 +139,12 @@ do_option(char *name)
                }
        }
 
+       if (strcmp(name, "COMPAT_DF12") == 0 &&
+           getenv("NO_COMPAT_DF12") == NULL &&
+           (value == NULL || strcmp(value, "1") != 0))
+               errx(1, "options COMPAT_DF12 not specified, "
+                    "set NO_COMPAT_DF12 to ignore");
+
        inf = fopen(file, "r");
        if (inf == NULL) {
                outf = fopen(file, "w");