diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2021-02-08 21:52:31 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2021-02-08 22:00:25 +0000 |
| commit | 07cac176fba947381c8111b8e02e8067e7fa542a (patch) | |
| tree | b28c123859066e8c4995c9c9d8d64f755bb9eecc /libexec | |
| parent | 35af933173d516101f4c44af328fbe2d6e587869 (diff) | |
| download | src-07cac176fba947381c8111b8e02e8067e7fa542a.tar.gz src-07cac176fba947381c8111b8e02e8067e7fa542a.zip | |
Don't check compat.linux.emul_path before loading linux(4)
Fix e40787f900f to make libexec/rc/rc.d/linux retrieve the sysctl
after loading the kernel module which provides it, not before.
Reported By: jkim
Sponsored By: The FreeBSD Foundation
Diffstat (limited to 'libexec')
| -rwxr-xr-x | libexec/rc/rc.d/linux | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux index 4381b62cc660..f44a9d02fc8d 100755 --- a/libexec/rc/rc.d/linux +++ b/libexec/rc/rc.d/linux @@ -18,7 +18,6 @@ stop_cmd=":" linux_start() { local _emul_path _tmpdir - _emul_path="$(sysctl -n compat.linux.emul_path)" load_kld -e 'linux(aout|elf)' linux case `sysctl -n hw.machine_arch` in @@ -26,6 +25,9 @@ linux_start() load_kld -e 'linux64elf' linux64 ;; esac + + _emul_path="$(sysctl -n compat.linux.emul_path)" + if [ -x ${_emul_path}/sbin/ldconfigDisabled ]; then _tmpdir=`mktemp -d -t linux-ldconfig` ${_emul_path}/sbin/ldconfig -C ${_tmpdir}/ld.so.cache |