Update to use kldload, no temporary files!

6 files changed, 24 insertions, 38 deletions

diff --git a/sys/modules/ibcs2/ibcs2 b/sys/modules/ibcs2/ibcs2
index a649885..0fd465f 100755
--- a/sys/modules/ibcs2/ibcs2
+++ b/sys/modules/ibcs2/ibcs2
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id$
+#	$Id: ibcs2,v 1.7 1997/02/22 12:47:59 peter Exp $
 
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin; export PATH
@@ -35,18 +35,9 @@ fi
 
 set -e
 
-kernelfile=`sysctl -n kern.bootfile`
-kernelfile=`basename $kernelfile`
-newkernelfile="/tmp/_${kernelfile}+ibcs2$$"
-
-trap 'rm -f $newkernelfile; exit 1' 1 2 3 13 15
-
-rm -f $newkernelfile
-modload -e ibcs2_mod -o $newkernelfile -q /lkm/ibcs2_mod.o
+kldload ibcs2
 
 for loader in $LOADERS; do
-	modload -e ibcs2_${loader}_mod -o/tmp/ibcs2_${loader} -q -u \
-		-A${newkernelfile} /lkm/ibcs2_${loader}_mod.o
+	kldload ibcs2_${loader} 
 done
-rm -f ${newkernelfile}
 set +e
diff --git a/sys/modules/ibcs2/ibcs2.sh b/sys/modules/ibcs2/ibcs2.sh
index a649885..0fd465f 100644
--- a/sys/modules/ibcs2/ibcs2.sh
+++ b/sys/modules/ibcs2/ibcs2.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id$
+#	$Id: ibcs2,v 1.7 1997/02/22 12:47:59 peter Exp $
 
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin; export PATH
@@ -35,18 +35,9 @@ fi
 
 set -e
 
-kernelfile=`sysctl -n kern.bootfile`
-kernelfile=`basename $kernelfile`
-newkernelfile="/tmp/_${kernelfile}+ibcs2$$"
-
-trap 'rm -f $newkernelfile; exit 1' 1 2 3 13 15
-
-rm -f $newkernelfile
-modload -e ibcs2_mod -o $newkernelfile -q /lkm/ibcs2_mod.o
+kldload ibcs2
 
 for loader in $LOADERS; do
-	modload -e ibcs2_${loader}_mod -o/tmp/ibcs2_${loader} -q -u \
-		-A${newkernelfile} /lkm/ibcs2_${loader}_mod.o
+	kldload ibcs2_${loader} 
 done
-rm -f ${newkernelfile}
 set +e
diff --git a/sys/modules/joy/joy b/sys/modules/joy/joy
index 3f5bbb9..3f165a6 100644
--- a/sys/modules/joy/joy
+++ b/sys/modules/joy/joy
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $Id$
+# $Id: joy,v 1.3 1997/02/22 12:48:17 peter Exp $
 
-modload -q -u -A `sysctl -n kern.bootfile` /lkm/joy_mod.o
+kldload joy
diff --git a/sys/modules/joy/joy.sh b/sys/modules/joy/joy.sh
index 3f5bbb9..3f165a6 100644
--- a/sys/modules/joy/joy.sh
+++ b/sys/modules/joy/joy.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $Id$
+# $Id: joy,v 1.3 1997/02/22 12:48:17 peter Exp $
 
-modload -q -u -A `sysctl -n kern.bootfile` /lkm/joy_mod.o
+kldload joy
diff --git a/sys/modules/linux/linux b/sys/modules/linux/linux
index 9945a99..8545fbb 100644
--- a/sys/modules/linux/linux
+++ b/sys/modules/linux/linux
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-# $Id: linux,v 1.4 1997/02/22 12:48:25 peter Exp $
+# $Id: linux,v 1.5 1998/09/07 16:15:59 cracauer Exp $
 
-if modstat -n linux_mod > /dev/null ; then
-	echo Linux lkm already loaded
+FOUND=`kldstat -v | egrep 'linux(aout|elf)'`
+
+if [ "x$FOUND" != x ] ; then           
+	echo Linux driver already loaded
 	exit 1
-else
-	modload -e linux_mod -u -q -o /tmp/linux_mod /lkm/linux_mod.o
+else    
+	kldload linux                                                
 fi
diff --git a/sys/modules/linux/linux.sh b/sys/modules/linux/linux.sh
index 9945a99..8545fbb 100644
--- a/sys/modules/linux/linux.sh
+++ b/sys/modules/linux/linux.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-# $Id: linux,v 1.4 1997/02/22 12:48:25 peter Exp $
+# $Id: linux,v 1.5 1998/09/07 16:15:59 cracauer Exp $
 
-if modstat -n linux_mod > /dev/null ; then
-	echo Linux lkm already loaded
+FOUND=`kldstat -v | egrep 'linux(aout|elf)'`
+
+if [ "x$FOUND" != x ] ; then           
+	echo Linux driver already loaded
 	exit 1
-else
-	modload -e linux_mod -u -q -o /tmp/linux_mod /lkm/linux_mod.o
+else    
+	kldload linux                                                
 fi