diff options
| author | Davide Italiano <davide@FreeBSD.org> | 2014-10-16 18:04:43 +0000 |
|---|---|---|
| committer | Davide Italiano <davide@FreeBSD.org> | 2014-10-16 18:04:43 +0000 |
| commit | 2be111bf7dda0f18d645f0e201b6555bbe3da1ac (patch) | |
| tree | f232fa8c3b1009450da57b71fb0323893520f81c /sys/kern/vfs_mountroot.c | |
| parent | 148bdd15d5cb3873e94e61b2678ce2ad208e3a93 (diff) | |
| download | src-2be111bf7dda0f18d645f0e201b6555bbe3da1ac.tar.gz src-2be111bf7dda0f18d645f0e201b6555bbe3da1ac.zip | |
Follow up to r225617. In order to maximize the re-usability of kernel code
in userland rename in-kernel getenv()/setenv() to kern_setenv()/kern_getenv().
This fixes a namespace collision with libc symbols.
Submitted by: kmacy
Tested by: make universe
Notes
Notes:
svn path=/head/; revision=273174
Diffstat (limited to 'sys/kern/vfs_mountroot.c')
| -rw-r--r-- | sys/kern/vfs_mountroot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index 9ec7340ad3e6..2816e1ba8c78 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -445,7 +445,7 @@ parse_dir_ask_printenv(const char *var) { char *val; - val = getenv(var); + val = kern_getenv(var); if (val != NULL) { printf(" %s=%s\n", var, val); freeenv(val); @@ -836,9 +836,9 @@ vfs_mountroot_conf0(struct sbuf *sb) sbuf_printf(sb, "cd9660:/dev/acd0 ro\n"); sbuf_printf(sb, ".timeout %d\n", root_mount_timeout); } - s = getenv("vfs.root.mountfrom"); + s = kern_getenv("vfs.root.mountfrom"); if (s != NULL) { - opt = getenv("vfs.root.mountfrom.options"); + opt = kern_getenv("vfs.root.mountfrom.options"); tok = s; error = parse_token(&tok, &mnt); while (!error) { |