The branch main has been updated by trasz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e026f4243c5a65d19a63d98f55be17e8294a1e87
commit e026f4243c5a65d19a63d98f55be17e8294a1e87
Author: Edward Tomasz Napierala <tr...@freebsd.org>
AuthorDate: 2021-03-16 16:48:13 +0000
Commit: Edward Tomasz Napierala <tr...@freebsd.org>
CommitDate: 2021-03-18 20:30:21 +0000
Fix the 'linux' rc script on aarch64.
Previously it would try to load linux.ko instead of linux64.ko
and fail. While here, don't try to match 'linuxaout'; even if
implemented, it's the same module as `linuxelf`.
Reviewed By: emaste
Sponsored By: EPSRC
Differential Revision: https://reviews.freebsd.org/D29288
---
libexec/rc/rc.d/linux | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux
index f44a9d02fc8d..c9c45ba8b338 100755
--- a/libexec/rc/rc.d/linux
+++ b/libexec/rc/rc.d/linux
@@ -19,11 +19,17 @@ linux_start()
{
local _emul_path _tmpdir
- load_kld -e 'linux(aout|elf)' linux
case `sysctl -n hw.machine_arch` in
+ aarch64)
+ load_kld -e 'linux64elf' linux64
+ ;;
amd64)
+ load_kld -e 'linuxelf' linux
load_kld -e 'linux64elf' linux64
;;
+ i386)
+ load_kld -e 'linuxelf' linux
+ ;;
esac
_emul_path="$(sysctl -n compat.linux.emul_path)"
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
