diff options
| author | Wojciech A. Koszek <wkoszek@FreeBSD.org> | 2007-05-16 16:08:04 +0000 |
|---|---|---|
| committer | Wojciech A. Koszek <wkoszek@FreeBSD.org> | 2007-05-16 16:08:04 +0000 |
| commit | 5f9974ae574fbddb768211744da378da5dbb2831 (patch) | |
| tree | 03ff842bb083cfa0e60ff73df52ccd060a23abba | |
| parent | e829ed67a2b9386ad61d3b1bbbb833fe90185d49 (diff) | |
Notes
| -rw-r--r-- | sys/kern/kern_mib.c | 5 | ||||
| -rw-r--r-- | usr.sbin/config/kernconf.tmpl | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c index 2ccb207c5933..c10e5f23e2fe 100644 --- a/sys/kern/kern_mib.c +++ b/sys/kern/kern_mib.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include "opt_posix.h" +#include "opt_config.h" #include <sys/param.h> #include <sys/kernel.h> @@ -296,8 +297,12 @@ SYSCTL_PROC(_kern, KERN_SECURELVL, securelevel, CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_PRISON, 0, 0, sysctl_kern_securelvl, "I", "Current secure level"); +#ifdef INCLUDE_CONFIG_FILE /* Actual kernel configuration options. */ extern char kernconfstring[]; +#else +char kernconfstring[] = "\0"; +#endif static int sysctl_kern_config(SYSCTL_HANDLER_ARGS) diff --git a/usr.sbin/config/kernconf.tmpl b/usr.sbin/config/kernconf.tmpl index 981efb7581a8..182614b937b0 100644 --- a/usr.sbin/config/kernconf.tmpl +++ b/usr.sbin/config/kernconf.tmpl @@ -7,11 +7,11 @@ #include "opt_config.h" #ifdef INCLUDE_CONFIG_FILE +/* + * For !INCLUDE_CONFIG_FILE case, you should look at kern_mib.c. This is + * where kernconfstring is defined then. + */ const char kernconfstring[] __attribute__ ((section("kern_conf"))) = "%%KERNCONFFILE%%"; -#else - -const char kernconfstring[] = "\0"; - #endif /* INCLUDE_CONFIG_FILE */ |