Support debconf configuration of -dynroot-sparse

* Support configuring -dynroot-sparse via debconf.  The AFS_DYNROOT
  option in /etc/openafs/afs.conf.client is now tri-valued instead of a
  boolean, and the boolean values will be mapped to the corresponding
  options on upgrade.  Based on work by Jakob Haufe.  (Closes: #644564)

diff --git a/debian/changelog b/debian/changelog
index 345795b30a363733ab8bf22859bd4a3cad05902e..5bb0a18b7f5d890bd23a502e543fa882f1ab49a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openafs (1.6.2-2) UNRELEASED; urgency=low
+
+  * Support configuring -dynroot-sparse via debconf.  The AFS_DYNROOT
+    option in /etc/openafs/afs.conf.client is now tri-valued instead of a
+    boolean, and the boolean values will be mapped to the corresponding
+    options on upgrade.  Based on work by Jakob Haufe.  (Closes: #644564)
+
+ -- Russ Allbery <rra@debian.org>  Wed, 06 Mar 2013 00:48:49 -0800
+
 openafs (1.6.2-1) experimental; urgency=low
 
   * New upstream release.

diff --git a/debian/openafs-client.config b/debian/openafs-client.config
index c5db27e7c4cda73fbe7a68f4444f42dcb936cc57..539c815887d000c321d42e615755669844f6288e 100644 (file)
--- a/debian/openafs-client.config
+++ b/debian/openafs-client.config
@@ -44,6 +44,11 @@ if [ "x$AFS_CRYPT" != "x" ] ; then
     db_set openafs-client/crypt "$AFS_CRYPT"
 fi
 if [ "x$AFS_DYNROOT" != "x" ] ; then
+    if [ "x$AFS_DYNROOT" = 'xtrue' ] ; then
+        AFS_DYNROOT=Yes
+    elif [ "x$AFS_DYNROOT" = 'xfalse' ] ; then
+        AFS_DYNROOT=No
+    fi
     db_set openafs-client/dynroot "$AFS_DYNROOT"
 fi
 if [ "x$AFS_FAKESTAT" != "x" ] ; then

diff --git a/debian/openafs-client.init b/debian/openafs-client.init
index f91529bb8ead43bc0d85fd5d679bae47c5091483..b04e95bcadaa204c38a2286798a19f2bff2f9f85 100755 (executable)
--- a/debian/openafs-client.init
+++ b/debian/openafs-client.init
@@ -119,8 +119,10 @@ choose_afsd_options() {
     if is_on $AFS_AFSDB ; then
         AFSD_OPTIONS="$AFSD_OPTIONS -afsdb"
     fi
-    if is_on $AFS_DYNROOT ; then
+    if [ "$AFS_DYNROOT" = 'Yes' ] ; then
         AFSD_OPTIONS="$AFSD_OPTIONS -dynroot"
+    elif [ "$AFS_DYNROOT" = 'Sparse' ] ; then
+        AFSD_OPTIONS="$AFSD_OPTIONS -dynroot-sparse"
     fi
     if is_on $AFS_FAKESTAT ; then
         AFSD_OPTIONS="$AFSD_OPTIONS -fakestat"

diff --git a/debian/openafs-client.templates b/debian/openafs-client.templates
index 06d0cdd6aa550bc031ec6e2228e2da1c98ad7f6f..3002840c0963dcff6a2805cfe39cb0923e4200ab 100644 (file)
--- a/debian/openafs-client.templates
+++ b/debian/openafs-client.templates
@@ -60,8 +60,9 @@ _Description: Encrypt authenticated traffic with AFS fileserver?
  significantly more difficult.
 
 Template: openafs-client/dynroot
-Type: boolean
-Default: true
+Type: select
+__Choices: Yes, Sparse, No
+Default: Yes
 _Description: Dynamically generate the contents of /afs?
  /afs generally contains an entry for each cell that a client can talk to.
  Traditionally, these entries were generated by servers in the client's
@@ -72,6 +73,12 @@ _Description: Dynamically generate the contents of /afs?
  /etc/openafs/CellAlias to include aliases for common cells.  (The syntax
  of this file is one line per alias, with the cell name, a space, and then
  the alias for that cell.)
+ .
+ The Sparse option is the same as Yes except that, rather than populating
+ /afs from /etc/openafs/CellServDB immediately, cells other than the local
+ cell will not appear until they are accessed.  Cell aliases as set in the
+ CellAlias file are shown as normal, although they may appear to be
+ dangling links until traversed.
 
 Template: openafs-client/fakestat
 Type: boolean