* In the init script, handle modules named either with or without the

    .mp extension on SMP hosts.  (Closes: #305389, #307280, #307797)

diff --git a/debian/changelog b/debian/changelog
index accaef2d07425f96aa98982d1da95958dad5f5fd..871f24ebce81d199a175dcec591c6d05f0107e03 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openafs (1.3.81-3sarge1) unstable; urgency=low
 
   * libpam-openafs-kaserver: Fix compilation so that the PAM module isn't
     missing symbols and therefore unusable.  (Closes: #308844)
+  * In the init script, handle modules named either with or without the
+    .mp extension on SMP hosts.  (Closes: #305389, #307280, #307797)
 
  --
 

diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux
index acb78450331cca75812132580cc1629f87440637..88a55eab3632767651f7220ba1b1a9d3d67ecfea 100644 (file)
--- a/src/afsd/afs.rc.linux
+++ b/src/afsd/afs.rc.linux
@@ -53,7 +53,22 @@ choose_client() {
        # For now, just use uname -r to get the module version. 
        VERSION=`uname -r`
 
-       LIBAFS=openafs.*o
+        # The Debian OpenAFS packages do not add the .mp by default as of 1.3,
+        # but modules obtained from other sources may.  If a module with the
+        # .mp exists and this is an SMP system, use it; otherwise, use the
+        # default value.  Unset $MP if not using it so that we can use it
+        # later in the call to modprobe.
+        if [ -n "$MP" -a -f "$MODLOADDIR/openafs${MP}.o" ] ; then
+                LIBAFS=openafs${MP}.o
+        elif [ -n "$MP" -a -f "$MODLOADDIR/openafs${MP}.ko" ] ; then
+                LIBAFS=openafs${MP}.ko
+        elif [ -f "$MODLOADDIR/openafs.ko" ] ; then
+                MP=
+                LIBAFS=openafs.ko
+        else
+                MP=
+                LIBAFS=openafs.o
+        fi
 }
 
 #
@@ -120,18 +135,20 @@ load_client() {
                choose_client
        fi
     
-       if [ ! -f $MODLOADDIR/$LIBAFS ] ; then
-               echo AFS module $MODLOADDIR/$LIBAFS does not exist. Not starting AFS.
-               echo Please consider building kernel modules using instructions in
- echo /usr/share/doc/openafs-client/README.modules
+       if [ ! -f "$MODLOADDIR/$LIBAFS" ] ; then
+                echo <<EOF
+AFS module $MODLOADDIR/$LIBAFS does not exist.
+Not starting AFS.  Please consider building kernel modules using
+instructions in /usr/share/doc/openafs-client/README.modules
+EOF
                exit 0
        fi
 
        # use the prefix command if required
 #      set_prefix
-               LOADED=`/sbin/lsmod | fgrep openafs`
+       LOADED=`/sbin/lsmod | fgrep openafs`
        if [ -z "$LOADED" ] ; then
-       modprobe openafs
+                modprobe openafs${MP}
        fi
 }