d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use compat.linux.emul_path instead of hardcoded path in /etc/rc.d/linux

Browse Source 
In /etc/rc.d/linux the mounting paths of procfs, sysfs and devfs
are hardcoded to "/compat/linux".  Switching to the content of
compat.linux.emul_path sysctl would allow to switch linuxulator
to different place.

Submitted by:	freebsdnewbie_freenet.de
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D27807
This commit is contained in:
Edward Tomasz Napierala 2021-02-02 14:40:38 +00:00
parent 43d44842ae
commit e40787f900
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libexec/rc/rc.d/linux
View File

@ -18,6 +18,7 @@ stop_cmd=":"
linux_start() linux_start()
{ {
local _emul_path _tmpdir local _emul_path _tmpdir
_emul_path="$(sysctl -n compat.linux.emul_path)"
load_kld -e 'linux(aout|elf)' linux load_kld -e 'linux(aout|elf)' linux
case `sysctl -n hw.machine_arch` in case `sysctl -n hw.machine_arch` in
@ -25,11 +26,11 @@ linux_start()
load_kld -e 'linux64elf' linux64 load_kld -e 'linux64elf' linux64
;; ;;
esac esac
if [ -x /compat/linux/sbin/ldconfigDisabled ]; then if [ -x ${_emul_path}/sbin/ldconfigDisabled ]; then
_tmpdir=`mktemp -d -t linux-ldconfig` _tmpdir=`mktemp -d -t linux-ldconfig`
/compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache ${_emul_path}/sbin/ldconfig -C ${_tmpdir}/ld.so.cache
if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then if ! cmp -s ${_tmpdir}/ld.so.cache ${_emul_path}/etc/ld.so.cache; then
cat ${_tmpdir}/ld.so.cache > /compat/linux/etc/ld.so.cache cat ${_tmpdir}/ld.so.cache > ${_emul_path}/etc/ld.so.cache
fi fi
rm -rf ${_tmpdir} rm -rf ${_tmpdir}
fi fi
@ -47,7 +48,6 @@ linux_start()
fi fi
if checkyesno linux_mounts_enable; then if checkyesno linux_mounts_enable; then
_emul_path="/compat/linux"
mount -o nocover -t linprocfs linprocfs "${_emul_path}/proc" mount -o nocover -t linprocfs linprocfs "${_emul_path}/proc"
mount -o nocover -t linsysfs linsysfs "${_emul_path}/sys" mount -o nocover -t linsysfs linsysfs "${_emul_path}/sys"
mount -o nocover -t devfs devfs "${_emul_path}/dev" mount -o nocover -t devfs devfs "${_emul_path}/dev"