[26335] in Source-Commits
/svn/athena r25524 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue May 29 20:28:00 2012
Date: Tue, 29 May 2012 20:27:58 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205300027.q4U0RwZF021107@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-29 20:27:58 -0400 (Tue, 29 May 2012)
New Revision: 25524
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
Log:
Remove duplicate test for nonzero exit status
Nuke /auto-upgrade in case it's sticking around from a failed upgrade
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-29 20:58:13 UTC (rev 25523)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-30 00:27:58 UTC (rev 25524)
@@ -58,8 +58,6 @@
fi
function pie_grub() {
-
-
# change DEFAULT in /etc/grub to SAVED
if [[ $FAKE == 1 ]]; then
echo perl -i.bak -pe 's/^GRUB_DEFAULT=.*$/GRUB_DEFAULT=saved/' /etc/default/grub
@@ -74,11 +72,6 @@
exit 1
fi
- if [[ $? -ne 0 ]]; then
- complain "Setting GRUB_CMDLINE_LINUX_DEFAULT in /etc/default/grub returned a non-zero exit status"
- exit 1
- fi
-
}
@@ -236,6 +229,7 @@
knetinfo="netcfg/dhcp_timeout=60 netcfg/get_hostname=$(hostname)"
fi
+runcmd "rm -rf /auto-upgrade"
runcmd "mkdir -p /auto-upgrade"
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"
