From f3b69866463282e309069af93dc3f487336f5b82 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 26 Mar 2010 12:25:01 -0700 Subject: [PATCH] Don't add CellServDB records if AFSDB is in use * If the user configures openafs-client to use AFSDB records for VLDB server location, don't prompt the user for VLDB servers for the local cell even if they're not present in CellServDB and don't try to add an entry for the local cell to CellServDB. (Closes: #575299) --- debian/changelog | 9 +++++++++ debian/openafs-client.postinst | 10 +++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c1e64520..b0dd87b55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +openafs (1.4.12+dfsg-3) UNRELEASED; urgency=low + + * If the user configures openafs-client to use AFSDB records for VLDB + server location, don't prompt the user for VLDB servers for the local + cell even if they're not present in CellServDB and don't try to add an + entry for the local cell to CellServDB. (Closes: #575299) + + -- Russ Allbery Fri, 26 Mar 2010 12:24:34 -0700 + openafs (1.4.12+dfsg-2) unstable; urgency=low * Apply upstream deltas: diff --git a/debian/openafs-client.postinst b/debian/openafs-client.postinst index ca3fdf4e5..f29916817 100644 --- a/debian/openafs-client.postinst +++ b/debian/openafs-client.postinst @@ -30,10 +30,15 @@ if [ "$1" = configure ] || [ "$1" = reconfigure ] ; then # If ThisCell is not in CellServDB, we have to prompt the user for the # VLDB servers. Unfortunately, we can't do this in config because we # need the CellServDB file, which is part of the package. + # + # If the user is using afsdb for cell location, don't worry about + # prompting them for cells for their local system. + db_get openafs-client/afsdb + afsdb="$RET" if grep -q -F "$THISCELL" /etc/openafs/CellServDB \ && [ "x$THISCELL" != "x" ] ; then : - else + elif [ x"$afsdb" != xtrue ] ; then db_input critical openafs-client/cell-info || true db_input high openafs-client/run-client || true db_go @@ -70,8 +75,7 @@ EOF db_get openafs-client/run-client echo AFS_CLIENT="$RET" > /etc/openafs/afs.conf.client - db_get openafs-client/afsdb - echo AFS_AFSDB="$RET" >> /etc/openafs/afs.conf.client + echo AFS_AFSDB="$afsdb" >> /etc/openafs/afs.conf.client db_get openafs-client/crypt echo AFS_CRYPT="$RET" >> /etc/openafs/afs.conf.client db_get openafs-client/dynroot -- 2.39.5