[28457] in Source-Commits
installer commit: Fix db_progress in installer.sh
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Sep 29 17:26:00 2014
Date: Mon, 29 Sep 2014 17:25:53 -0400
From: Jonathan D Reed <jdreed@mit.edu>
Message-Id: <201409292125.s8TLPrLG009528@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/installer/commit/4f866691c526b80e6858ae1fb57c9c11d7e0ab3a
commit 4f866691c526b80e6858ae1fb57c9c11d7e0ab3a
Author: Jonathan Reed <jdreed@mit.edu>
Date: Mon Sep 29 17:24:25 2014 -0400
Fix db_progress in installer.sh
Ensure that we are only STEP'ing by 1, and that we are calling
SET, not STEP, when we want to set an explicit value.
pxe/stage1/debathena/installer.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pxe/stage1/debathena/installer.sh b/pxe/stage1/debathena/installer.sh
index d23222d..750a36f 100755
--- a/pxe/stage1/debathena/installer.sh
+++ b/pxe/stage1/debathena/installer.sh
@@ -433,13 +433,13 @@ db_progress INFO $OWNER/downloading
run rm -rf "$PREFIX/stage2"
run mkdir "$PREFIX/stage2"
run wget -q -P "$PREFIX/stage2" "http://debathena.mit.edu/net-install/$distro/$arch/linux"
-db_progress STEP 2
+db_progress STEP 1
swap downloading thing "stage 2 initrd"
db_progress INFO $OWNER/downloading
run wget -q -P "$PREFIX/stage2" "http://debathena.mit.edu/net-install/$distro/$arch/initrd.gz"
-db_progress STEP 3
+db_progress STEP 1
run kexec -l "$PREFIX/stage2/linux" --append="$kargs" --initrd="$PREFIX/stage2/initrd.gz"
-db_progress STEP 4
+db_progress SET 4
db_progress STOP
run kexec -e
