regression in /etc/rc.d/linux

From: Sergey V. Dyatko <sergey.dyatko_at_gmail.com>
Date: Tue, 9 Feb 2021 18:00:41 +0300
Hi,

Subj was introduced in  e40787f900f3c262d5134d342e5a16757dd2193c

compat.linux.emul_path isn't defined before kldload`ing linux/linux64 kernel. 

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
_at__at_ -18,7 +18,6 _at__at_ 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
_at__at_ -26,6 +25,9 _at__at_ 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

--
wbr, Sergey
Received on Tue Feb 09 2021 - 14:00:07 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:27 UTC