Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: make_developer_script_runner.sh

Issue 4418001: make_developer_script_runner.sh: fix using full-sized kernels (Closed) Base URL: http://git.chromium.org/git/crosutils.git@0.9.110.B
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: make_developer_script_runner.sh
diff --git a/make_developer_script_runner.sh b/make_developer_script_runner.sh
index a1ef2db1e5a9e64c87ec892ec4e8662838ade7d3..32d3133c1a7fb6c7fc197507189efe74d8977e5b 100755
--- a/make_developer_script_runner.sh
+++ b/make_developer_script_runner.sh
@@ -65,7 +65,7 @@ if [ -b "$FLAGS_image" ]; then
else
max_kern_size=32768
dd if=/dev/zero of="${FLAGS_image}" bs=512 count=0 \
- seek=$((1 + max_kern_size + header_offset + stateful_sectors))
+ seek=$((1 + max_kern_size + (2 * header_offset) + stateful_sectors))
sudo=""
fi
@@ -99,7 +99,7 @@ kernel_sectors=$((kernel_bytes / 512))
kernel_sectors=$(roundup $kernel_sectors)
$sudo $GPT create $FLAGS_image
-trap "rm $FLAGS_image" ERR
+trap "rm $FLAGS_image; echo 'An error occurred! Rerun with -v for details.'" ERR
offset=$header_offset
$sudo $GPT add -b $offset -s $stateful_sectors \
@@ -119,4 +119,4 @@ $sudo $GPT boot -p -b "$PMBRCODE" -i 1 $FLAGS_image 1>&2
$sudo $GPT show $FLAGS_image
-echo "Done."
+echo "Emitted $FLAGS_image successfully!"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698