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.

diff --git a/debian/changelog b/debian/changelog
index 698effc5b8c4ef0fd4c14ba4d5df7fa83957aa16..e8f6434c1f471582bf631e9ba2fdec4e1b7e333d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ openafs (1.5.61+dfsg-1) UNRELEASED; urgency=low
     - NFS translator clients now work properly on Linux.
     - Client cache readahead.
     - Network performance improvements.
+  * 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>  Fri, 21 Aug 2009 22:19:03 -0700
 

diff --git a/debian/module/rules b/debian/module/rules
index f7d20758e80d7bae8fe1e84504d6a093fead6d3f..4e8d4a426bfe01c64c788222f673246374b976e6 100755 (executable)
--- a/debian/module/rules
+++ b/debian/module/rules
@@ -58,6 +58,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 $@
@@ -83,8 +84,10 @@ install-stamp: build-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
+       cd src/libafs && make install
        install -d -g root -o root -m 755 $(moduledir)
-       install -g root -o root -m 755 src/libafs/MODLOAD-*/*.ko $(moduledir)/
+       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 b81fce5483baafd21d1c8a61e4d8155170937a46..637ea961d19100ba99e9ca3643e5307ce54cea0f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -101,9 +101,10 @@ build-stamp:
            --sysconfdir=/etc --libexecdir=/usr/lib \
            --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \
            --enable-supergroups --enable-largefile-fileserver \
-           --enable-bos-new-config --with-xslt-processor=xsltproc \
-           --with-html-xsl=$(HTML_XSL) --enable-debug --enable-lwp-debug \
-           $(DEBIAN_OPT_FLAGS) $(SYSTEM)
+           --enable-bos-new-config --enable-demand-attach-fs \
+           --enable-bos-restricted-mode --enable-disconnected \
+           --with-xslt-processor=xsltproc --with-html-xsl=$(HTML_XSL) \
+           --enable-debug --enable-lwp-debug $(DEBIAN_OPT_FLAGS) $(SYSTEM)
        chmod a+x config.sub src/libafs/make_kbuild_makefile.pl \
            src/config/make_vnode.pl
        dh build --after configure