[25787] in Source-Commits
/svn/athena r25230 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jul 12 17:05:41 2011
Date: Tue, 12 Jul 2011 17:05:35 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107122105.p6CL5ZDi025529@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-12 17:05:35 -0400 (Tue, 12 Jul 2011)
New Revision: 25230
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Support Natty's idea of preseeding the keyboard layout
* Support a hostname
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2011-07-12 20:51:52 UTC (rev 25229)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2011-07-12 21:05:35 UTC (rev 25230)
@@ -108,9 +108,19 @@
$MAYBE cd /h
$MAYBE wget -N http://debathena.mit.edu/net-install/${UBUNTU_RELEASE}/${arch}/initrd.gz
$MAYBE wget -N http://debathena.mit.edu/net-install/${UBUNTU_RELEASE}/${arch}/linux
+case "$UBUNTU_RELEASE" in
+ natty)
+ # Sigh
+ kbdcode="keyboard-configuration/layoutcode=us"
+ ;;
+ *)
+ kbdcode="console-setup/layoutcode=us"
+ ;;
+esac
+hostname=$(hostname)
# This is just the guts of the hackboot script:
dkargs="DEBCONF_DEBUG=5"
-kargs="netcfg/get_hostname= locale=en_US console-setup/layoutcode=us \
+kargs="netcfg/get_hostname=$hostname locale=en_US $kbdcode \
interface=auto \
netcfg/dhcp_timeout=60 \
url=http://18.9.60.73/installer/${UBUNTU_RELEASE}/debathena.preseed \
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2011-07-12 20:51:52 UTC (rev 25229)
+++ trunk/debathena/config/auto-update/debian/changelog 2011-07-12 21:05:35 UTC (rev 25230)
@@ -1,3 +1,10 @@
+debathena-auto-update (1.23.4) UNRELEASED; urgency=low
+
+ * Support Natty's idea of preseeding the keyboard layout
+ * Support a hostname
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 12 Jul 2011 17:04:55 -0400
+
debathena-auto-update (1.23.3) unstable; urgency=low
* Log when running update hook
