From: Russ Allbery <rra@debian.org>
Date: Sat, 28 Aug 2010 00:52:36 +0000 (-0700)
Subject: Use dpkg --print-architecture in openafs-fileserver.config
X-Git-Tag: debian/1.5.77-1~21
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=18ce65fa4e724296f271d30cde4175dd234738cd;p=packages%2Fo%2Fopenafs.git

Use dpkg --print-architecture in openafs-fileserver.config

* Use dpkg --print-architecture, not --print-installation-architecture,
  in the openafs-fileserver config script.  The latter is deprecated.
  Thanks, Peter Palfrader.  (Closes: #594488)
---

diff --git a/debian/changelog b/debian/changelog
index b56af987a..ad137ca95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ openafs (1.5.75-3) UNRELEASED; urgency=low
   * The openafs-fileserver init script now depends on $named since
     apparently the volserver requires DNS during startup.  Thanks, Jaap
     Winius.  (Closes: #589783)
+  * Use dpkg --print-architecture, not --print-installation-architecture,
+    in the openafs-fileserver config script.  The latter is deprecated.
+    Thanks, Peter Palfrader.  (Closes: #594488)
   * Run the DKMS build commands in a subshell to work around a DKMS bug
     that caused the module build logs to be discarded.  (LP: #593509)
   * Add a status command to the openafs-fileserver init script.
diff --git a/debian/openafs-fileserver.config b/debian/openafs-fileserver.config
index c333f4784..9e221e616 100644
--- a/debian/openafs-fileserver.config
+++ b/debian/openafs-fileserver.config
@@ -6,7 +6,7 @@ set -e
 db_version 2.0
 
 # Warn anyone who's trying to run the file server on alpha.
-arch=`dpkg --print-installation-architecture`
+arch=`dpkg --print-architecture`
 if [ "$arch" = "alpha" ] ; then
     db_input high openafs-fileserver/alpha-broken || true
 fi