[26308] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r25510 - trunk/debathena/scripts/installer

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed May 16 10:58:47 2012

Date: Wed, 16 May 2012 10:58:46 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205161458.q4GEwkPr026787@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-05-16 10:58:46 -0400 (Wed, 16 May 2012)
New Revision: 25510

Modified:
   trunk/debathena/scripts/installer/install-debathena.beta.sh
Log:
Unbreak pre-DKMS installs, which have been broken since April 2011
and nobody noticed.


Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.beta.sh	2012-05-16 13:56:45 UTC (rev 25509)
+++ trunk/debathena/scripts/installer/install-debathena.beta.sh	2012-05-16 14:58:46 UTC (rev 25510)
@@ -308,9 +308,12 @@
   aptitude -y install resolvconf
 fi
 
+# Only add our openafs component if DKMS isn't available
+openafs_component=""
 if aptitude show openafs-modules-dkms > /dev/null; then
+  modules="openafs-modules-dkms"
+else
   openafs_component=" openafs"
-  modules="openafs-modules-dkms"
 fi
 
 output "Adding the Debathena repository to the apt sources"


home help back first fref pref prev next nref lref last post