[25667] in Source-Commits
/svn/athena r25154 - trunk/debathena/scripts/installer/pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 22 12:24:08 2011
Date: Wed, 22 Jun 2011 12:24:02 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106221624.p5MGO23u023087@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-22 12:24:02 -0400 (Wed, 22 Jun 2011)
New Revision: 25154
Modified:
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.autoinstall
trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common
Log:
* Move suite selection into installer
* Fix path to partman recipe
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-06-21 20:23:12 UTC (rev 25153)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-06-22 16:24:02 UTC (rev 25154)
@@ -83,12 +83,13 @@
mirrorsite="mirrors.mit.edu"
installertype="production"
+suite="lucid"
echo "Welcome to Athena."
echo
while [ -z "$pxetype" ] ; do
- echo "Using $installertype installer and $mirrorsite"
+ echo "Will install $suite using $installertype installer and $mirrorsite"
echo
echo "Choose one:"
echo
@@ -100,7 +101,7 @@
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 " 3: Punt to a completely ${ccc}vanilla install of Ubuntu 11.04${nnn} (Lucid Lynx)."
+ echo " 3: Punt to a completely ${ccc}vanilla install of Ubuntu 10.04${nnn} (Lucid Lynx)."
echo " (Note: locale and keyboard have already been set.)"
echo
echo " 4: /bin/sh (for rescue purposes)"
@@ -108,6 +109,7 @@
echo " Advanced users only:"
echo " m: Select a different mirror. "
echo " b: Toggle between beta and production installer. "
+ echo " s: Change the suite (version)."
echo
echo -n "Choose: "
read r
@@ -138,9 +140,14 @@
/bin/sh;;
m|M)
echo
- echo -n "Enter a new mirror hostname:"
+ echo "NOTE: There is no data validation. Don't make a typo."
+ echo -n "Enter a new mirror hostname: "
read mirrorsite
- echo "Using mirror site $mirrorsite. Now select the installation type.";;
+ s|S)
+ echo
+ echo "NOTE: There is no data validation. Don't make a typo."
+ echo -n "Enter a new suite: "
+ read suite
b|B)
if [ "$installertype" = "production" ]; then
echo "Switching to beta installer."
@@ -149,7 +156,6 @@
echo "Switching to production installer."
installertype="production"
fi
- echo "Now select the installation type.";;
*)
echo "Choose one of the above, please.";;
esac
@@ -235,6 +241,7 @@
# Perferred hostname of mirror site
cat >> preseed <<EOF
+d-i mirror/suite string $suite
d-i apt-setup/hostname string $mirrorsite
d-i mirror/http/hostname string $mirrorsite
EOF
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.autoinstall
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.autoinstall 2011-06-21 20:23:12 UTC (rev 25153)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.autoinstall 2011-06-22 16:24:02 UTC (rev 25154)
@@ -57,7 +57,7 @@
# 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 /debathena-lucid/lvm-cluster-machine.partman
+d-i partman-auto/expert_recipe_file string /debathena/lvm-cluster-machine.partman
# This is completely undocumented. Sigh.
d-i partman-auto-lvm/new_vg_name string athena
# As reported in Trac #253
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common 2011-06-21 20:23:12 UTC (rev 25153)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common 2011-06-22 16:24:02 UTC (rev 25154)
@@ -7,8 +7,8 @@
d-i mirror/http/directory string /ubuntu
d-i mirror/http/proxy string
-# Suite to install.
-d-i mirror/suite string lucid
+# Suite to install. (Now set in installer)
+#d-i mirror/suite string natty
# Suite to use for loading installer components (optional).
#d-i mirror/udeb/suite string intrepid
# Components to use for loading installer components (optional).
