[26007] in Source-Commits
/svn/athena r25342 - trunk/debathena/scripts/installer/pxe/natty/debathena
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Aug 1 16:05:36 2011
Date: Mon, 1 Aug 2011 16:05:30 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201108012005.p71K5U2c007455@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-08-01 16:05:30 -0400 (Mon, 01 Aug 2011)
New Revision: 25342
Modified:
trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common
Log:
* Preseed mirror selection values for vanilla installs so
they actually use the mirror selected by the user
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-08-01 19:12:00 UTC (rev 25341)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/installer.sh 2011-08-01 20:05:30 UTC (rev 25342)
@@ -139,6 +139,9 @@
cat >> preseed <<EOF
d-i apt-setup/hostname string $mirrorsite
d-i mirror/http/hostname string $mirrorsite
+d-i mirror/country string manual
+d-i mirror/http/directory string /ubuntu
+d-i mirror/http/proxy string
EOF
if [ vanilla = "$pxetype" ] ; then
Modified: trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common
===================================================================
--- trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common 2011-08-01 19:12:00 UTC (rev 25341)
+++ trunk/debathena/scripts/installer/pxe/natty/debathena/preseed.common 2011-08-01 20:05:30 UTC (rev 25342)
@@ -1,11 +1,11 @@
# This contains only things which interactive installers are still likely to want.
### Mirror settings
-d-i mirror/country string manual
-# Now set explicitly by install script.
+# All of these are now set by installer.sh
+# d-i mirror/country string manual
# d-i mirror/http/hostname string mirrors.mit.edu
-d-i mirror/http/directory string /ubuntu
-d-i mirror/http/proxy string
+# d-i mirror/http/directory string /ubuntu
+# d-i mirror/http/proxy string
# Suite to install.
d-i mirror/suite string natty
