[24259] in Source-Commits
/svn/athena r23857 - in trunk/debathena/scripts/installer/pxe: . jaunty jaunty/debathena-jaunty
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Tue Jun 16 21:49:09 2009
X-Barracuda-Envelope-From: geofft@mit.edu
Date: Tue, 16 Jun 2009 21:48:56 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200906170148.n5H1muKl013904@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-06-16 21:48:56 -0400 (Tue, 16 Jun 2009)
New Revision: 23857
Added:
trunk/debathena/scripts/installer/pxe/jaunty/
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty-loader.sh
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/
Removed:
trunk/debathena/scripts/installer/pxe/jaunty/athena10-intrepid-loader.sh
trunk/debathena/scripts/installer/pxe/jaunty/athena10-intrepid.preseed
trunk/debathena/scripts/installer/pxe/jaunty/athena10-intrepid/
Modified:
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/preseed.autoinstall
trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/preseed.common
Log:
Copy intrepid/ to jaunty/ and s/athena10-intrepid/debathena-jaunty/g.
Copied: trunk/debathena/scripts/installer/pxe/jaunty (from rev 23839, trunk/debathena/scripts/installer/pxe/intrepid)
Deleted: trunk/debathena/scripts/installer/pxe/jaunty/athena10-intrepid-loader.sh
Deleted: trunk/debathena/scripts/installer/pxe/jaunty/athena10-intrepid.preseed
Copied: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty (from rev 23839, trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid)
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid/installer.sh 2009-06-09 08:36:49 UTC (rev 23839)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/installer.sh 2009-06-17 01:48:56 UTC (rev 23857)
@@ -1,6 +1,6 @@
#!/bin/sh
-cd /athena10-intrepid
+cd /debathena-jaunty
touch preseed
@@ -8,7 +8,7 @@
netconfig () {
echo "Configuring network..."
- mp=/athena10-intrepid
+ mp=/debathena-jaunty
export IPADDR NETMASK GATEWAY SYSTEM CONTROL
while [ -z "$IPADDR" ] ; do
echo -n "Enter IP address: "
@@ -54,21 +54,24 @@
}
-echo "Welcome to Athena 10."
+echo "Welcome to Athena."
echo
while [ -z "$pxetype" ] ; do
echo "Choose one:"
echo
- echo " 1: Perform an unattended Athena 10 install, WIPING OUT your ENTIRE DISK."
- echo " This will give you a CLUSTER-style \"public workstation\" setup,"
- echo " and you hereby agree with the license terms at:"
+ echo " 1: Perform an unattended debathena-cluster install, WIPING OUT your"
+ echo " ENTIRE DISK. This option is only intended for people setting up"
+ echo " public cluster machines maintained by IS&T/Athena. If you select"
+ echo " this option, you hereby agree with the license terms at:"
echo " <http://dlc.sun.com/dlj/DLJ-v1.1.txt>,"
echo " Sun's Operating System Distributor License for Java version 1.1."
- echo " 2: Do a normal Athena 10 install. You'll need to answer normal Ubuntu"
- echo " install prompts, and then the Athena-10-specific prompts, including"
- echo " choosing which flavor of Athena 10 you'd like."
- echo " 8: Punt to a completely vanilla install of Ubuntu 8.10 (Intrepid Ibex)"
+ echo
+ echo " 2: Do a normal Debathena install. You'll need to answer normal Ubuntu"
+ echo " install prompts, and then the Athena-specific prompts, including"
+ echo " choosing which flavor of Debathena you'd like (e.g., private workstation)."
+ echo
+ echo " 8: Punt to a completely vanilla install of Ubuntu 9.04 (Jaunty Jackalope)."
echo " (Note: locale and keyboard have already been set.)"
echo
echo " 9: /bin/sh (for rescue purposes)"
@@ -77,9 +80,9 @@
read r
case "$r" in
1)
- echo "Athena 10 CLUSTER it is."; pxetype=cluster ;;
+ echo "Debathena CLUSTER it is."; pxetype=cluster ;;
2)
- echo "Normal Athena 10 install it is."; pxetype=choose ;;
+ echo "Normal Debathena install it is."; pxetype=choose ;;
8)
echo "Vanilla Ubuntu it is."; pxetype=vanilla;;
9)
@@ -146,7 +149,7 @@
# This is used by the final installer step.
# A hardcoded number is used as DNS may still be iffy.
-echo "Fetching Athena 10 postinstaller."
+echo "Fetching Debathena postinstaller."
# 18.92.2.195 = OLD athena10.mit.edu
# 18.9.60.73 = NEW athena10.mit.edu
wget http://18.9.60.73/install-debathena.sh
@@ -154,7 +157,7 @@
# Let the postinstall know what we are up to.
echo "$pxetype" > $mp/pxe-install-flag
-echo "Initial Athena 10 installer complete; exiting preconfig to start main install."
+echo "Initial Debathena installer complete; exiting preconfig to start main install."
echo "Hit return to continue."
read r
exit 0
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid/postinstall.sh 2009-06-09 08:36:49 UTC (rev 23839)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/postinstall.sh 2009-06-17 01:48:56 UTC (rev 23857)
@@ -3,10 +3,10 @@
# This is only invoked when the relevant preseed entry is passed in
# during the preinstall questioning. (Thus, not for vanilla installs.)
-cp /athena10-intrepid/preseed /target/root/athena10.preseed
-cp /athena10-intrepid/install-debathena.sh /target/root
-if test -f /athena10-intrepid/pxe-install-flag ; then
- cp /athena10-intrepid/pxe-install-flag /target/root/pxe-install-flag
+cp /debathena-jaunty/preseed /target/root/debathena.preseed
+cp /debathena-jaunty/install-debathena.sh /target/root
+if test -f /debathena-jaunty/pxe-install-flag ; then
+ cp /debathena-jaunty/pxe-install-flag /target/root/pxe-install-flag
fi
chvt 5
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/preseed.autoinstall
===================================================================
--- trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid/preseed.autoinstall 2009-06-09 08:36:49 UTC (rev 23839)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/preseed.autoinstall 2009-06-17 01:48:56 UTC (rev 23857)
@@ -53,9 +53,9 @@
# The recipe format is documented in the file devel/partman-auto-recipe.txt.
# If you have a way to get a recipe file into the d-i environment, you can
# just point at it.
-d-i partman-auto/expert_recipe_file string /athena10-intrepid/lvm-cluster-machine.partman
+d-i partman-auto/expert_recipe_file string /debathena-jaunty/lvm-cluster-machine.partman
# This is completely undocumented. Sigh.
-d-i partman-auto-lvm/new_vg_name string athena10
+d-i partman-auto-lvm/new_vg_name string athena
# Don't punt for no-method filesystems. Another undocumented option.
d-i partman-basicmethods/method_only boolean false
Modified: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/preseed.common
===================================================================
--- trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid/preseed.common 2009-06-09 08:36:49 UTC (rev 23839)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty/preseed.common 2009-06-17 01:48:56 UTC (rev 23857)
@@ -7,7 +7,7 @@
d-i mirror/http/proxy string
# Suite to install.
-d-i mirror/suite string intrepid
+d-i mirror/suite string jaunty
# Suite to use for loading installer components (optional).
#d-i mirror/udeb/suite string intrepid
# Components to use for loading installer components (optional).
@@ -32,4 +32,4 @@
# packages and run commands in the target system.
#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
-d-i preseed/late_command string sh /athena10-intrepid/postinstall.sh
+d-i preseed/late_command string sh /debathena-jaunty/postinstall.sh
Copied: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty-loader.sh (from rev 23839, trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid-loader.sh)
===================================================================
--- trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid-loader.sh 2009-06-09 08:36:49 UTC (rev 23839)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty-loader.sh 2009-06-17 01:48:56 UTC (rev 23857)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# This could probably all just go in the preseed file, but what a mess!
+# 18.9.60.73 = athena10.mit.edu (formerly 18.92.2.195)
+
+cd /
+wget http://18.9.60.73/installer/intrepid/debathena-jaunty.tar.gz > /dev/tty5 2>&1
+tar xzf debathena-jaunty.tar.gz
+chvt 5
+sh debathena-jaunty/installer.sh < /dev/tty5 > /dev/tty5 2>&1
+chvt 1
+# Pick up the generated preseed file (if any):
+echo file://debathena-jaunty/preseed
Copied: trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed (from rev 23839, trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid.preseed)
===================================================================
--- trunk/debathena/scripts/installer/pxe/intrepid/athena10-intrepid.preseed 2009-06-09 08:36:49 UTC (rev 23839)
+++ trunk/debathena/scripts/installer/pxe/jaunty/debathena-jaunty.preseed 2009-06-17 01:48:56 UTC (rev 23857)
@@ -0,0 +1,4 @@
+# Minimal preseed, designed to just punt to our own network-based installer.
+# 18.92.2.195 = athena10.mit.edu
+# 18.9.60.73 = new athena10.mit.edu
+d-i preseed/include_command string wget -q http://18.9.60.73/installer/intrepid/debathena-jaunty-loader.sh ; sh debathena-jaunty-loader.sh
