Revert the last change; Derrick says it isn't ready yet.

diff --git a/debian/README.Debian b/debian/README.Debian
index dfb97df2cb99092deba61d4103d032ea7d5b8fb6..5a0c0bf516279ea4b2932a29debb2e5839a4a3f0 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -16,9 +16,9 @@ Introduction
   particular, XFS, ReiserFS, and tmpfs will NOT work.  If you are using
   one of those file systems and don't have a spare partition for a
   separate file system for the cache, you need to use the -memcache option
-  to afsd or create a large file with dd, create an ext2 file system in it
-  with mkfs, and then mount it with mount -o loop for use as a cache
-  partition.
+  to afsd (although this is not always stable) or create a large file with
+  dd, create an ext2 file system in it with mkfs, and then mount it with
+  mount -o loop for use as a cache partition.
 
   FAM does not work correctly with AFS except for directories that are
   world-readable since it does not run in the user's security context and
@@ -138,4 +138,4 @@ PAM Authentication
   the openafs-kpasswd package to get the administrative utilities for
   managing those Kerberos accounts.
 
- -- Russ Allbery <rra@debian.org>, Thu, 23 Aug 2007 09:38:32 -0700
+ -- Russ Allbery <rra@debian.org>, Tue, 26 Sep 2006 16:32:58 z

diff --git a/debian/afs.conf b/debian/afs.conf
index e88a00abc2dcf6edb60b0d0b92be81387e229b2e..f3eeb76f3b54dd82d9b65d18be727a02915bf981 100644 (file)
--- a/debian/afs.conf
+++ b/debian/afs.conf
@@ -53,17 +53,15 @@ VERBOSE=
 #   -waitclose  Make close calls always synchronous (slows them down, though)
 #   -files_per_subdir   Number of files per cache subdir (Default: 2048).
 #
-# The default behavior is to use a disk cache and let afsd automatically
-# choose an apporpriate set of flags.  This should produce reasonable behavior
-# for most working sets provided that one is using a modern AFS client (1.4.2
-# or later).
+# Using the memory cache is not recommended.  It's less stable than the disk
+# cache and doesn't improve performance as much as it might sound.
 #
-# You can override that default behavior by setting OPTIONS to a specific set
-# of flags.  For example, to use a 32MB memory cache, try:
-#
-#     OPTIONS="-memcache -chunksize 15 -dcache 1024"
+# The default behavior is to let afsd automatically choose an apporpriate set
+# of flags.  This should produce reasonable behavior for most working sets
+# provided that one is using a modern AFS client (1.4.2 or later).
 #
-# (2^15 * 1024 bytes of cache.)
+# You can override that default behavior by setting OPTIONS to a specific set
+# of flags.
 OPTIONS=AUTOMATIC
 
 # The default value for the client sysname (as returned by fs sysname) is

diff --git a/debian/changelog b/debian/changelog
index 33df6defbaae67d0fb51cea324774bc674a927f1..afbc42ad61bfd6ca38058d02154bc6053ed745ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-openafs (1.4.4.dfsg1-8) UNRELEASED; urgency=low
-
-  * Stop recommending against memcache.  It's more stable now.  Include a
-    sample memcache options line in afs.conf.
-
- -- Russ Allbery <rra@debian.org>  Thu, 23 Aug 2007 09:39:22 -0700
-
 openafs (1.4.4.dfsg1-7) unstable; urgency=low
 
   * Switch to quilt for managing patches to the upstream source.