* Provide a way of setting sysname in afs.conf. (Closes: #324694)

diff --git a/debian/afs.conf b/debian/afs.conf
index aa67e87244242dfef2259e417d366d2933f7b828..48fe9441f83d096d90f3d987e4a4e5256e4cb2af 100644 (file)
--- a/debian/afs.conf
+++ b/debian/afs.conf
@@ -77,6 +77,18 @@ SMALL="-chunksize 18 -files 2500 -dcache 2000 -stat 3000 -daemons 2 -volumes 200
 # the above variables or to any set of flags that you prefer.
 OPTIONS=AUTOMATIC
 
+# The default value for the client sysname (as returned by fs sysname) is
+# determined during the kernel module build and is taken from the architecture
+# and the major Linux kernel version.  Accesses to directories named "@sys" in
+# AFS will be internally redirected to a directory by this name by the AFS
+# client, allowing a single path to resolve to different directories depending
+# on the client architecture.
+#
+# If you would like to override the client sysname, uncomment this line and
+# set the variable to a space-separated list of sysnames.  The AFS client will
+# attempt to resolve @sys to each directory name in the order given.
+#AFS_SYSNAME=""
+
 # If you want to prefer particular servers for replicated volumes, you can
 # configure that by defining an afs_server_prefs function here and then
 # uncommenting the setting of AFS_POST_INIT below.  For more information, see

diff --git a/debian/changelog b/debian/changelog
index bc1bc266ec1e04669aefaccfa4b6f925cbe3c731..0d1dfee8d1f42c9b6d9a6ba80737a47b54f07fdf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ openafs (1.3.87-2) unstable; urgency=low
     it to contain just the name of the cell.
   * Detect AFS caches on non-ext2/ext3 file systems and abort AFS client
     initialization.  (Closes: #249315)
+  * Provide a way of setting sysname in afs.conf.  (Closes: #324694)
   * Don't create the unused /etc/openafs/AFSLog file.  (Closes: #120097)
   * Redo how library object files are found for the PAM module build to
     avoid assuming C locale character set behavior.  (Closes: #323582)

diff --git a/debian/openafs-client.init b/debian/openafs-client.init
index ce8caad881e98b4e58f1512dae08ca550ef9f0ba..37f40c4e07148db2ce12c5d3066f00ae9eae3fd4 100755 (executable)
--- a/debian/openafs-client.init
+++ b/debian/openafs-client.init
@@ -153,6 +153,11 @@ start_client() {
     if is_on $AFS_CRYPT ; then
         fs setcrypt on
     fi
+
+    # From /etc/openafs/afs.conf, set a sysname list if one was configured.
+    if [ -n "$AFS_SYSNAME" ] ; then
+        fs sysname $AFS_SYSNAME
+    fi
 }
 
 # Kill all processes that are accessing AFS.  Not enabled by default, and