[27769] in Source-Commits
scripts commit: Add the PPA on Ubuntu, always:
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 4 12:34:45 2014
Date: Tue, 4 Mar 2014 12:34:39 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201403041734.s24HYdqa024878@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/scripts/commit/c9480cb0380e83be99f0c012b358f52da48031e2
commit c9480cb0380e83be99f0c012b358f52da48031e2
Author: Jonathan Reed <jdreed@mit.edu>
Date: Wed Feb 26 12:53:57 2014 -0500
Add the PPA on Ubuntu, always:
Per discussion in (Trac: #1377), we should always add the PPA on
Ubuntu, otherwise things will break. The user can opt-out of it,
unless they're installing cluster.
installer/install-debathena.beta.sh | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/installer/install-debathena.beta.sh b/installer/install-debathena.beta.sh
index a643d8b..5245dbe 100644
--- a/installer/install-debathena.beta.sh
+++ b/installer/install-debathena.beta.sh
@@ -367,16 +367,23 @@ else
fi
if [ "$modules" = "openafs-modules-dkms" ] && \
- dpkg-query -W -f '${Status}\n' linux-image-\*-lts-raring 2>/dev/null | grep -qx "install ok installed"; then
- output "Ubuntu does not yet support OpenAFS on this kernel."
- output "You will need to configure the OpenAFS PPA instead."
+ [ "$ubuntu" = "yes" ]; then
+ ppa="yes"
+ output "OpenAFS is available from both the Ubuntu 'universe' repository"
+ output "and a PPA (personal package archive) maintained by the OpenAFS"
+ output "team. We recommend using the PPA, as it is mostly likely to"
+ output "keep pace with Ubuntu's kernel updates. For some releases,"
+ output "the PPA is required for AFS to function correctly at all."
if [ cluster != "$category" ]; then
ask "Is that ok? [Y/n] " y
if [ y != "$answer" ]; then
- exit 0
+ ppa="no"
fi
fi
- add-apt-repository -y ppa:openafs/stable
+ if [ "$ppa" = "yes"]; then
+ output "Enabling OpenAFS PPA..."
+ add-apt-repository -y ppa:openafs/stable
+ fi
fi
# Select the correct headers package
