Don't rely on a shell scripts to do the simple job of loading

kernel modules for ibcs2_enable and svr4_enable.

Don't rely on a shell script to do the neglibly less simple
job of loading a kernel module and running one command for
linux_enable.

These shell scripts are going away.

1 files changed, 8 insertions, 2 deletions

diff --git a/etc/rc b/etc/rc
index ca94011..c5f2b92 100644
--- a/etc/rc
+++ b/etc/rc
@@ -548,7 +548,13 @@ fi
 #
 case ${linux_enable} in
 [Yy][Ee][Ss])
-	echo -n ' linux';	linux > /dev/null 2>&1
+	echo -n ' linux'
+	if ! kldstat -v | grep -E 'linux(aout|elf)' > /dev/null; then
+		kldload linux > /dev/null 2>&1
+	fi
+	if [ -x /compat/linux/sbin/ldconfig ]; then
+		/compat/linux/sbin/ldconfig
+	fi
 	;;
 esac
 
@@ -556,7 +562,7 @@ esac
 #
 case ${svr4_enable} in
 [Yy][Ee][Ss])
-	echo -n ' svr4';	svr4 > /dev/null 2>&1
+	echo -n ' svr4';	kldload svr4 > /dev/null 2>&1
 	;;
 esac