[26316] in Source-Commits
/svn/athena r25516 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu May 17 13:30:37 2012
Date: Thu, 17 May 2012 13:30:35 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205171730.q4HHUZg3022932@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-17 13:30:35 -0400 (Thu, 17 May 2012)
New Revision: 25516
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
trunk/debathena/config/auto-update/debian/changelog
Log:
In auto-update:
* UI fixup in athena-auto-upgrade
* Handle new netcfg/disable_autoconfig parameter
* Set the root device by UUID, not LVM name
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-17 17:26:43 UTC (rev 25515)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-17 17:30:35 UTC (rev 25516)
@@ -4,6 +4,7 @@
DEBUG=0
FORCE=0
+# You can set DEBUG_RELEASE in the environment for testing
DEBUG_RELEASE=""
VERBOSE=0
FAKE=0
@@ -22,6 +23,7 @@
;;
f)
FORCE=1
+ UPGRADE_ANYWAY=yes
;;
t)
UPGRADE_TO_TESTING=yes
@@ -205,9 +207,25 @@
debug "Using IPADDR=$IPADDR"
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) \
- netcfg/disable_dhcp=true \
+ $nodhcp \
netcfg/get_domain=mit.edu \
netcfg/get_nameservers=\"18.72.0.3 18.70.0.160\"\
netcfg/get_ipaddress=$IPADDR \
@@ -222,15 +240,6 @@
runcmd "wget http://debathena.mit.edu/net-install/${UBUNTU_RELEASE}/${arch}/initrd.gz -O /auto-upgrade/initrd.gz"
runcmd "wget http://debathena.mit.edu/net-install/${UBUNTU_RELEASE}/${arch}/linux -O /auto-upgrade/linux"
-case "$UBUNTU_RELEASE" in
- natty|oneiric|precise)
- # Sigh
- kbdcode="keyboard-configuration/layoutcode=us"
- ;;
- *)
- kbdcode="console-setup/layoutcode=us"
- ;;
-esac
# This is just the guts of the hackboot script:
dkargs="DEBCONF_DEBUG=5"
kargs="$knetinfo locale=en_US $kbdcode \
@@ -255,7 +264,10 @@
echo "Adding auto-upgrade /auto-upgrade/linux" >&2
cat<<EOF
menuentry "auto-upgrade" {
- set root="(athena-root)"
+ insmod ext2
+ insmod part_msdos
+ insmod lvm
+ search --no-floppy --fs-uuid --set=root \${GRUB_DEVICE_UUID}
echo "Loading auto-upgrade kernel for ${UBUNTU_RELEASE}"
linux /auto-upgrade/linux $kargs
echo "Loading auto-upgrade ramdisk for ${UBUNTU_RELEASE}"
@@ -266,6 +278,7 @@
END
+debug "$(cat $tmpfile)"
runcmd "cp $tmpfile /etc/grub.d/49_auto-upgrade"
rm -f $tmpfile
runcmd "chmod 755 /etc/grub.d/49_auto-upgrade"
Modified: trunk/debathena/config/auto-update/debian/changelog
===================================================================
--- trunk/debathena/config/auto-update/debian/changelog 2012-05-17 17:26:43 UTC (rev 25515)
+++ trunk/debathena/config/auto-update/debian/changelog 2012-05-17 17:30:35 UTC (rev 25516)
@@ -1,12 +1,18 @@
debathena-auto-update (1.35) unstable; urgency=low
+ [ John Jarvis ]
* Switched from using kexec to rebooting into the netinstall
kernel/initrd copied to athena-root. (Trac #1011)
Added a runcmd function for handling logging and verbose
output.
- -- John Jarvis <jarv@madison> Tue, 15 Nov 2011 11:10:18 -0500
+ [ Jonathan Reed ]
+ * UI fixup in athena-auto-upgrade
+ * Handle new netcfg/disable_autoconfig parameter
+ * Set the root device by UUID, not LVM name
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 17 May 2012 13:30:28 -0400
+
debathena-auto-update (1.34) unstable; urgency=low
* Depend on the timeout package if necessary. Also special-case that
