From: Sam Hartman <hartmans@debian.org>
Date: Mon, 31 May 2004 17:53:52 +0000 (+0000)
Subject: Accept openafs.o or openafs.ko as modules
X-Git-Tag: debian/1.3.64-2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c7aa7745ae8c4ea221173063574fc014ce922389;p=packages%2Fo%2Fopenafs.git

Accept openafs.o or openafs.ko as modules
---

diff --git a/debian/changelog b/debian/changelog
index 749fb1498..9e5dac89f 100644
--- 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 b300cb885..acb784503 100644
--- 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
 }