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

Unified Diff: bin/cros_make_image_bootable

Issue 3421025: cros_make_image_bootable is not compatible with restart_inside_chroot (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: Created 10 years, 3 months 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: bin/cros_make_image_bootable
diff --git a/bin/cros_make_image_bootable b/bin/cros_make_image_bootable
index cc4c4695613ac8f659b21c6c01e15d8c9120557c..bcbef4cd7336c83df6da9fb8d87cb1cc4fc3f8c2 100755
--- a/bin/cros_make_image_bootable
+++ b/bin/cros_make_image_bootable
@@ -14,8 +14,12 @@ if [ ! -r "${COMMON_PATH}" ]; then
echo "ERROR! Cannot find common.sh: ${COMMON_PATH}" 1>&2
exit 1
fi
+
. "$(dirname "$0")/../common.sh"
+# Script must be run inside the chroot.
+assert_inside_chroot
+
set -e
. "$(dirname "$0")/../chromeos-common.sh" # for partoffset and partsize
@@ -46,8 +50,6 @@ if [ ! -r "${IMAGE}" ]; then
die "${IMAGE} cannot be read!"
fi
-# Script must be run inside the chroot.
-restart_in_chroot_if_needed $*
locate_gpt
set +e
« 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