diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2019-12-16 20:07:04 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2019-12-16 20:07:04 +0000 |
| commit | b5f20658ee91b62296384ec68cd1fc82a4fbe4bb (patch) | |
| tree | 5b5fbf88c8878ba6b1bf665ea0486f39508e70b4 /sys/amd64/linux | |
| parent | 83b75bb3cc228e2ab9f68976b820b7bb76caa9c7 (diff) | |
| download | src-b5f20658ee91b62296384ec68cd1fc82a4fbe4bb.tar.gz src-b5f20658ee91b62296384ec68cd1fc82a4fbe4bb.zip | |
Add compat.linux.emul_path, so it can be set to something other
than "/compat/linux". Useful when you have several compat directories
with different Linux versions and you don't want to clash with files
installed by linux-c7 packages.
Reviewed by: bcr (manpages)
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D22574
Notes
Notes:
svn path=/head/; revision=355818
Diffstat (limited to 'sys/amd64/linux')
| -rw-r--r-- | sys/amd64/linux/linux_sysvec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index b7fbf0768bf1..3a34e5dce913 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -836,7 +836,7 @@ static Elf64_Brandinfo linux_glibc2brand = { .brand = ELFOSABI_LINUX, .machine = EM_X86_64, .compat_3_brand = "Linux", - .emul_path = "/compat/linux", + .emul_path = linux_emul_path, .interp_path = "/lib64/ld-linux-x86-64.so.2", .sysvec = &elf_linux_sysvec, .interp_newpath = NULL, @@ -848,7 +848,7 @@ static Elf64_Brandinfo linux_glibc2brandshort = { .brand = ELFOSABI_LINUX, .machine = EM_X86_64, .compat_3_brand = "Linux", - .emul_path = "/compat/linux", + .emul_path = linux_emul_path, .interp_path = "/lib64/ld-linux.so.2", .sysvec = &elf_linux_sysvec, .interp_newpath = NULL, @@ -860,7 +860,7 @@ static Elf64_Brandinfo linux_muslbrand = { .brand = ELFOSABI_LINUX, .machine = EM_X86_64, .compat_3_brand = "Linux", - .emul_path = "/compat/linux", + .emul_path = linux_emul_path, .interp_path = "/lib/ld-musl-x86_64.so.1", .sysvec = &elf_linux_sysvec, .interp_newpath = NULL, |