3 files changed, 13 insertions, 15 deletions
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index ed7bed5750ccd..090f2fc7e72c0 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.23 1998/11/11 07:04:10 peter Exp $
+#	$Id: Makefile,v 1.18 1998/07/07 02:04:20 bde Exp $
 
 .PATH:	${.CURDIR}/../../i386/linux
 KMOD=	linux
@@ -27,7 +27,7 @@ linux_genassym.o:	linux_genassym.c linux.h @ machine
 	${CC} -c ${CFLAGS} -UKERNEL ${.IMPSRC}
 
 linux_genassym:	linux_genassym.o
-	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 opt_compat.h:
 	echo "#define COMPAT_43 1" > opt_compat.h
@@ -37,6 +37,6 @@ opt_linux.h opt_vmpage.h:
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${.CURDIR}/linux.sh ${DESTDIR}/usr/bin/linux
+		${.CURDIR}/linux ${DESTDIR}/usr/bin
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux/linux b/sys/modules/linux/linux
new file mode 100644
index 0000000000000..9945a9908c5c0
--- /dev/null
+++ b/sys/modules/linux/linux
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# $Id: linux,v 1.4 1997/02/22 12:48:25 peter Exp $
+
+if modstat -n linux_mod > /dev/null ; then
+	echo Linux lkm already loaded
+	exit 1
+else
+	modload -e linux_mod -u -q -o /tmp/linux_mod /lkm/linux_mod.o
+fi
diff --git a/sys/modules/linux/linux.sh b/sys/modules/linux/linux.sh
deleted file mode 100644
index 8545fbbc47bc7..0000000000000
--- a/sys/modules/linux/linux.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# $Id: linux,v 1.5 1998/09/07 16:15:59 cracauer Exp $
-
-FOUND=`kldstat -v | egrep 'linux(aout|elf)'`
-
-if [ "x$FOUND" != x ] ; then           
-	echo Linux driver already loaded
-	exit 1
-else    
-	kldload linux                                                
-fi