* Fix dependencies for module package

* Fix docs for module package
* Fix init.d script for removing openafs.o

diff --git a/debian/changelog b/debian/changelog
index 133092278011ee628f898d00dfcec6b823365f17..a5c83a7d9b91aa2a48991c04198d3eadd84e1828 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 openafs (1.0.snap20001106-1) unstable; urgency=low
 
   * New Upstream version
+  * Fix init.d script to properly remove openafs.o
 
- --
+ --  Sam Hartman <hartmans@mit.edu>  Tue,  7 Nov 2000 13:55:47 -0500
 
 openafs (1.0.snap20001104-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 3691e2570fe73390c12c75c5ae34d6425b6dff38..8a88207fbcc43f4174d81e99a1403cef144bf2d1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Standards-Version: 3.1.1
 
 Package: openafs-client
 Architecture: any
-Depends: ${shlibs:Depends}, debconf, openafs-modules
+Depends: ${shlibs:Depends}, debconf
+Recommends: openafs-modules
 Description: The AFS distributed filesystem- client support
    AFS is a distributed filesystem allowing cross-platform sharing of
    files among multiple computers.  Facilities are provided for access

diff --git a/debian/control.module b/debian/control.module
index b2fbd9ce10aba41c5fba49955bbc8a18f35366bd..30e44abb5ca19e405b7fadfcde7db34a09958ed2 100644 (file)
--- a/debian/control.module
+++ b/debian/control.module
@@ -6,6 +6,8 @@ Standards-Version: 3.1.1
 
 Package: openafs-modules-=KVERS
 Conflicts: openafs-client (= 1.0.snap20001103-1)
+
+Depends: openafs-client
 Provides: openafs-modules
 Architecture: any
 Description: The AFS distributed filesystem- Kernel Module

diff --git a/debian/control.module-image b/debian/control.module-image
index 495a9cb1c81e123a3b5a7a7cd27d585520d23191..f9bc7f1f655006ed66f211699539d8b2f107b2b7 100644 (file)
--- a/debian/control.module-image
+++ b/debian/control.module-image
@@ -8,6 +8,7 @@ Package: openafs-modules-=KVERS
 Conflicts: openafs-client (= 1.0.snap20001103-1)
 Provides: openafs-modules
 Architecture: any
+Depends: openafs-client
 Recommends: kernel-image-=KVERS (= =KREVS)
 Description: The AFS distributed filesystem- Kernel Module
    AFS is a distributed filesystem allowing cross-platform sharing of
@@ -15,3 +16,4 @@ Description: The AFS distributed filesystem- Kernel Module
    control, authentication, backup and administrative management.
    .
    This package provides the kernel module for the filesystem
+

diff --git a/debian/rules b/debian/rules
index d7d7c2e5fb8d9335c4085d2c40e2a1c64f115fef..bffad3277097ebeda8d9fa0073fef55cd1a444d2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -214,6 +214,7 @@ binary-modules: build-modules
                debian/$(modulepkg)/lib/modules/$(KVERS)/fs
 # Fix some stuff up
        install -d -o root -g root -m 755 debian/$(modulepkg)/usr/share/doc
+       ln -s openafs-client debian/$(modulepkg)/usr/share/doc/$(modulepkg)
        rm -rf debian/$(modulepkg)/usr/include
 ifeq ($(KERNEL_DEPENDS),y)
        sh debian/prep-modules $(KSRC) debian/control.module > debian/control

diff --git a/debian/sysname b/debian/sysname
index 0e061ca6e733ed3100e740a42eb991045f95f89a..75cb494642e85d738654326c1392001cc45e8eb9 100755 (executable)
--- a/debian/sysname
+++ b/debian/sysname
@@ -2,4 +2,9 @@
 case `arch` in
 i[3456]86)
        echo i386_linux22
+;;
+       *)
+       echo ERROr:  sysname not yet known
+       exit 1
+
 esac

diff --git a/src/afsd/afs.rc.linux b/src/afsd/afs.rc.linux
index 9b7bee6b11c4cb05646dda5cd1abd7c114332f75..3a16f2bea670549114dbf4aa7aa7d33a7c3017e2 100644 (file)
--- a/src/afsd/afs.rc.linux
+++ b/src/afsd/afs.rc.linux
@@ -171,10 +171,10 @@ case "$1" in
                    --pidfile /var/run/bos.pid
        fi
 
-       LIBAFS=`/sbin/lsmod | fgrep libafs`
+       LIBAFS=`/sbin/lsmod | fgrep openafs`
        if [ -n "$LIBAFS" ] ; then
                LIBAFS=`echo $LIBAFS | awk 'BEGIN { FS = " " } { print $1 }'`
-               /sbin/rmmod $LIBAFS
+               /sbin/rmmod openafs.o
                echo -n " libafs"
        fi
        echo "."