Enable demand-attach, disconnected, and bos restricted

Enable demand attach for the file server, bos restricted mode for
bosserver, and disconnected mode for the client.  Use the new flag
for Linux module packaging and adjust the installation rule
accordingly.  Remove backward compatibility with old init scripts
that expected the module to be named openafs.mp.o.

diff --git a/debian/changelog b/debian/changelog
index 73987cfc472bde8cd95f3c18770481560ad41db0..f86788750415c4f7c0eebdc57d665dd57b74d4cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ openafs (1.5.50.dfsg1-1) UNRELEASED; urgency=low
     - Client cache readahead.
     - Network performance improvements.
     - Much increased file server partition size limit.
+  * Build OpenAFS with demand-attach enabled for the file server, bos
+    restricted mode enabled for bosserver, and disconnected mode enabled
+    for the client.  Except for demand-attach, these options don't change
+    the default behavior, just make new capabilities available.
 
  -- Russ Allbery <rra@debian.org>  Wed, 16 Jul 2008 14:38:53 -0700
 

diff --git a/debian/module/rules b/debian/module/rules
index 99a2da166042117bd0c11c5785152a4cdd112454..8dfe52e8531b3bb48c28c47c60892d8ffab9d19d 100755 (executable)
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -57,6 +57,7 @@ configure-stamp:
        sh debian/prep-modules $(KSRC)
        sh configure --with-afs-sysname=$(SYS_NAME) \
            --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp \
+           --with-linux-kernel-packaging --enable-disconnected \
            --enable-debug --enable-lwp-debug --enable-kernel-debug \
            $(DEBIAN_OPT_FLAGS) $(DEBIAN_KERN_FLAGS)
        touch $@
@@ -82,11 +83,8 @@ install-stamp: build-stamp
        dh_clean -k
        cd src/libafs && make install
        install -d -g root -o root -m 755 $(moduledir)
-       install -g root -o root -m 755 debian/tmp/lib/openafs/*o $(moduledir)/
-       if test -f $(moduledir)/openafs.o \
-               -a ! -f $(moduledir)/openafs.mp.o ; then \
-           ln $(moduledir)/openafs.o $(moduledir)/openafs.mp.o || exit 1 ; \
-       fi
+       install -g root -o root -m 644 \
+           debian/tmp/lib/modules/*/extra/openafs/*o $(moduledir)/
        touch $@
 
 binary: binary-arch binary-indep

diff --git a/debian/rules b/debian/rules
index d574f078959ef3741d3d550f1d3c094db01a476e..c17d49dbff59bf313f78a7818d3b8080526aa0f7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -91,14 +91,14 @@ configure-stamp:
        rm -f doc/man-pages/man1/up.1
        sh regen.sh
        afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \
-           sh configure \
-           --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
-           --prefix=/usr --mandir=\$${prefix}/share/man \
+           sh configure --prefix=/usr --mandir=\$${prefix}/share/man \
            --sysconfdir=/etc --libexecdir=/usr/lib \
            --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \
-           --enable-supergroups --enable-largefile-fileserver \
-           --enable-bos-new-config \
-           --enable-debug --enable-lwp-debug \
+           --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
+           --enable-supergroups --enable-bos-new-config \
+           --enable-demand-attach-fs --enable-bos-restricted-mode \
+           --enable-disconnected \
+           --enable-debug --enable-debug-lwp --enable-debug-pam \
            $(DEBIAN_OPT_FLAGS) $(SYSTEM)
        chmod a+x src/libafs/make_kbuild_makefile.pl
        touch $@