Date: Tue, 2 Mar 2021 18:43:44 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 5dc2e1bcf41f - stable/13 - Don't check compat.linux.emul_path before loading linux(4) Message-ID: <202103021843.122Ihit4018779@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=5dc2e1bcf41f853b31b6d08a5c2d643408e890f3 commit 5dc2e1bcf41f853b31b6d08a5c2d643408e890f3 Author: Edward Tomasz Napierala <trasz@FreeBSD.org> AuthorDate: 2021-02-08 21:52:31 +0000 Commit: Edward Tomasz Napierala <trasz@FreeBSD.org> CommitDate: 2021-03-02 18:43:26 +0000 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 (cherry picked from commit 07cac176fba947381c8111b8e02e8067e7fa542a) --- libexec/rc/rc.d/linux | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103021843.122Ihit4018779>