From 05be8a79df451f5001cb9a125f5827a22a833e7c Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Tue, 7 Nov 2000 19:02:30 +0000 Subject: [PATCH] * Fix dependencies for module package * Fix docs for module package * Fix init.d script for removing openafs.o --- debian/changelog | 3 ++- debian/control | 3 ++- debian/control.module | 2 ++ debian/control.module-image | 2 ++ debian/rules | 1 + debian/sysname | 5 +++++ src/afsd/afs.rc.linux | 4 ++-- 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 133092278..a5c83a7d9 100644 --- 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 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 3691e2570..8a88207fb 100644 --- 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 b2fbd9ce1..30e44abb5 100644 --- 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 495a9cb1c..f9bc7f1f6 100644 --- 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 d7d7c2e5f..bffad3277 100755 --- 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 0e061ca6e..75cb49464 100755 --- 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 9b7bee6b1..3a16f2bea 100644 --- 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 "." -- 2.39.5