[26278] in Source-Commits
/svn/athena r25487 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon May 7 21:06:38 2012
Date: Mon, 7 May 2012 21:06:36 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205080106.q4816a2b020092@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-07 21:06:36 -0400 (Mon, 07 May 2012)
New Revision: 25487
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
Log:
Read defaults early to avoid clobbering command-line values
Convert kernel argument from debathena/ to da/
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-08 00:41:01 UTC (rev 25486)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-08 01:06:36 UTC (rev 25487)
@@ -10,6 +10,8 @@
UPGRADE_TO_TESTING=no
UPGRADE_ANYWAY=no
+# Read defaults here so as not to clobber command-line args later
+[ -f /etc/default/debathena-auto-update ] && . /etc/default/debathena-auto-update
while getopts "vfdt" opt; do
case "$opt" in
@@ -117,7 +119,6 @@
fi
}
-[ -f /etc/default/debathena-auto-update ] && . /etc/default/debathena-auto-update
if [ $DEBUG -ne 1 ]; then
# Redirect output to a log file
# Unless we're in debug mode
@@ -222,7 +223,7 @@
runcmd "wget http://debathena.mit.edu/net-install/${UBUNTU_RELEASE}/${arch}/linux -O /auto-upgrade/linux"
case "$UBUNTU_RELEASE" in
- natty|oneiric)
+ natty|oneiric|precise)
# Sigh
kbdcode="keyboard-configuration/layoutcode=us"
;;
@@ -237,7 +238,7 @@
panic=5 \
interface=auto \
url=http://18.9.60.73/installer/${UBUNTU_RELEASE}/debathena.preseed \
- debathena/pxetype=cluster --"
+ da/pxetype=cluster --"
debug "USING kargs=$kargs"
