[24274] in Source-Commits
/svn/athena r23872 - trunk/debathena/scripts/installer
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Jun 18 02:58:05 2009
Date: Thu, 18 Jun 2009 02:57:53 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906180657.n5I6vreP018875@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-06-18 02:57:53 -0400 (Thu, 18 Jun 2009)
New Revision: 23872
Modified:
trunk/debathena/scripts/installer/install-debathena.sh
Log:
If users choose to install extra-software in the installer script,
then they also need to accept the Sun Java license.
Modified: trunk/debathena/scripts/installer/install-debathena.sh
===================================================================
--- trunk/debathena/scripts/installer/install-debathena.sh 2009-06-18 04:38:19 UTC (rev 23871)
+++ trunk/debathena/scripts/installer/install-debathena.sh 2009-06-18 06:57:53 UTC (rev 23872)
@@ -84,6 +84,10 @@
echo "determined to be of interest to MIT users, such as LaTeX. It is pretty"
echo "big (several gigabytes, possibly more)."
echo ""
+echo "Note: by enabling this option, you hereby agree with the license terms at:"
+echo " <http://dlc.sun.com/dlj/DLJ-v1.1.txt> Sun's Operating System Distributor"
+echo " License for Java version 1.1."
+echo ""
if [ cluster = $category ] ; then
echo "Cluster install detected, so installing extras."
csoft=yes
@@ -94,6 +98,11 @@
csoft=yes
fi
fi
+if [ yes = "$csost" ]; then
+ # Preseed an answer to the java license query, which license was already accepted
+ # at install time:
+ echo "sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true" |debconf-set-selections
+fi
echo "A summary of your choices:"
echo " Category: $category"
@@ -117,10 +126,6 @@
# If someone is installing -cluster on an already-installed machine, it's
# assumed that this config has already happened and shouldn't be stomped on.
- # Preseed an answer to the java license query, which license was already accepted
- # at install time:
- echo "sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true" |debconf-set-selections
-
# Configure network based on the preseed file settings, if present.
if test -f /root/debathena.preseed ; then
# Switch to canonical hostname.
