Accept openafs.o or openafs.ko as modules

diff --git a/debian/changelog b/debian/changelog
index 749fb1498eb19f38f6493c14d67d2dfb5526a604..9e5dac89f87a5e4502194f3bc490c630a40ee661 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openafs (1.3.64-2) experimental; urgency=low
+
+  * Allow loading of a .ko file not just .o
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 31 May 2004 13:46:05 -0400
+
 openafs (1.3.64-1) experimental; urgency=low
 
   * New upstream version

diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux
index b300cb885bd42f62f6a7cc5fbe9973f6154eecd1..acb78450331cca75812132580cc1629f87440637 100644 (file)
--- a/src/afsd/afs.rc.linux
+++ b/src/afsd/afs.rc.linux
@@ -53,7 +53,7 @@ choose_client() {
        # For now, just use uname -r to get the module version. 
        VERSION=`uname -r`
 
-       LIBAFS=openafs$MP.o
+       LIBAFS=openafs.*o
 }
 
 #
@@ -128,10 +128,10 @@ load_client() {
        fi
 
        # use the prefix command if required
-       set_prefix
+#      set_prefix
                LOADED=`/sbin/lsmod | fgrep openafs`
        if [ -z "$LOADED" ] ; then
-           /sbin/insmod ${PREFIX:+-P $PREFIX} -f  $MODLOADDIR/$LIBAFS 
+       modprobe openafs
        fi
 }