[26998] in Source-Commits
/svn/athena r25881 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Apr 1 16:27:37 2013
Date: Mon, 1 Apr 2013 16:27:31 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304012027.r31KRVIs016902@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-01 16:27:30 -0400 (Mon, 01 Apr 2013)
New Revision: 25881
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* Desupport auto-upgrades to anything older than precise
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2013-04-01 19:59:30 UTC (rev 25880)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2013-04-01 20:27:30 UTC (rev 25881)
@@ -202,25 +202,9 @@
debug "Using NETMASK=$NETMASK"
debug "Using GATEWAY=$GATEWAY"
-nodhcp="netcfg/disable_dhcp=true"
-case "$UBUNTU_RELEASE" in
- oneiric|precise)
- kbdcode="keyboard-configuration/layoutcode=us"
- # "Yay"
- nodhcp="netcfg/disable_autoconfig=true"
- ;;
- natty)
- # Sigh
- kbdcode="keyboard-configuration/layoutcode=us"
- ;;
- *)
- kbdcode="console-setup/layoutcode=us"
- ;;
-esac
-
if [ -n "$NETMASK" ] && [ -n "$GATEWAY" ]; then
knetinfo="netcfg/get_hostname=$(hostname) \
- $nodhcp \
+ netcfg/disable_autoconfig=true \
netcfg/get_domain=mit.edu \
netcfg/get_nameservers=\"18.72.0.3 18.71.0.151 18.70.0.160\"\
netcfg/get_ipaddress=$IPADDR \
@@ -238,7 +222,8 @@
# This is just the guts of the hackboot script:
dkargs="DEBCONF_DEBUG=5"
-kargs="$knetinfo locale=en_US $kbdcode \
+kargs="$knetinfo locale=en_US \
+ keyboard-configuration/layoutcode=us \
quiet \
panic=5 \
interface=auto \
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2013-04-01 19:59:30 UTC (rev 25880)
+++ trunk/debathena/config/auto-update/debian/changelog 2013-04-01 20:27:30 UTC (rev 25881)
@@ -1,3 +1,9 @@
+debathena-auto-update (1.43) unstable; urgency=low
+
+ * Desupport auto-upgrades to anything older than precise
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 01 Apr 2013 16:27:24 -0400
+
debathena-auto-update (1.42.2) unstable; urgency=low
* Actually, don't bother cleaning up the headers by hand. Instead, just
