upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't check compat.linux.emul_path before loading linux(4)

Browse source 
Fix e40787f900 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

(cherry picked from commit 07cac176fb)
This commit is contained in:
Edward Tomasz Napierala 2021-02-08 21:52:31 +00:00
parent 1b2802ed4e
commit 5dc2e1bcf4
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libexec/rc/rc.d/linux
View file

@ -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