diff options
| -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. |
