svn commit: r295864 - head/sys/kern
Ian Lepore
ian at FreeBSD.org
Sun Feb 21 18:35:02 UTC 2016
Author: ian
Date: Sun Feb 21 18:35:01 2016
New Revision: 295864
URL: https://svnweb.freebsd.org/changeset/base/295864
Log:
Allow a dynamic env to override a compiled-in static env by passing in the
override indication in the env data.
Submitted by: bde
Modified:
head/sys/kern/kern_environment.c
Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c Sun Feb 21 18:17:09 2016 (r295863)
+++ head/sys/kern/kern_environment.c Sun Feb 21 18:35:01 2016 (r295864)
@@ -217,6 +217,9 @@ done:
* environment obtained from a boot loader, or to provide an empty buffer into
* which MD code can store an initial environment using kern_setenv() calls.
*
+ * When a copy of an initial environment is passed in, we start by scanning that
+ * env for overrides to the compiled-in envmode and hintmode variables.
+ *
* If the global envmode is 1, the environment is initialized from the global
* static_env[], regardless of the arguments passed. This implements the env
* keyword described in config(5). In this case env_pos is set to env_len,
@@ -238,6 +241,14 @@ done:
void
init_static_kenv(char *buf, size_t len)
{
+ char *cp;
+
+ for (cp = buf; cp != NULL && cp[0] != '\0'; cp += strlen(cp) + 1) {
+ if (strcmp(cp, "static_env.disabled=1") == 0)
+ envmode = 0;
+ if (strcmp(cp, "static_hints.disabled=1") == 0)
+ hintmode = 0;
+ }
if (envmode == 1) {
kern_envp = static_env;
More information about the svn-src-all
mailing list