From 933cb282b69d8ea606dab4980126805737e8d5fb Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 16 Mar 2021 16:48:13 +0000
Subject: [PATCH] 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

(cherry picked from commit e026f4243c5a65d19a63d98f55be17e8294a1e87)
---
 libexec/rc/rc.d/linux | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libexec/rc/rc.d/linux b/libexec/rc/rc.d/linux
index f44a9d02fc8..c9c45ba8b33 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
-	amd64)
+	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)"