diff options
| author | marcel <marcel@FreeBSD.org> | 2006-11-03 04:06:17 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2006-11-03 04:06:17 +0000 |
| commit | c4a6a4c4a7ee591ee2a9dfe2e118918707e4797e (patch) | |
| tree | 2c562372013331c8decdaf32d6f227316a6eff89 /sys/ia64 | |
| parent | 6ca4cb8feac0efeb113904e6e6aaa909b04a53ee (diff) | |
| download | FreeBSD-src-c4a6a4c4a7ee591ee2a9dfe2e118918707e4797e.zip FreeBSD-src-c4a6a4c4a7ee591ee2a9dfe2e118918707e4797e.tar.gz | |
Make sure kern_envp is never NULL. If we don't get a pointer to
the environment from the loader, use the static environment.
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/machdep.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index e23ae4b..f3a875e 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -586,10 +586,11 @@ ia64_init(void) preload_metadata = (caddr_t)bootinfo.bi_modulep; else metadata_missing = 1; - if (envmode == 1) - kern_envp = static_env; - else + + if (envmode == 0 && bootinfo.bi_envp) kern_envp = (caddr_t)bootinfo.bi_envp; + else + kern_envp = static_env; /* * Look at arguments passed to us and compute boothowto. |
