Don't check compat.linux.emul_path before loading linux(4)
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
This commit is contained in:
parent
35af933173
commit
07cac176fb
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user