image_to_vm.sh - Issue 2973005: fixed vm scripts - Code Review

Chromium Code Reviews

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

(9)

My Issues | Starred Open | Closed | All

Unified Diff: image_to_vm.sh

Issue 2973005: fixed vm scripts (Closed) Base URL: ssh://gitrw.chromium.org/crosutils.git

Patch Set: fixes Created 10 years, 5 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

« no previous file with comments | « fixup_image_for_qemu.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: image_to_vm.sh

diff --git a/image_to_vm.sh b/image_to_vm.sh

index 8450639276bf734ce20868f35523a97de3d381c0..ab29ddccedd5032bc6d4e3cdf44b6ca88ee7f9fd 100755

--- a/image_to_vm.sh

+++ b/image_to_vm.sh

@@ -69,6 +69,8 @@ IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${FLAGS_board}"

# Default to the most recent image

if [ -z "${FLAGS_from}" ] ; then

FLAGS_from="${IMAGES_DIR}/$(ls -t $IMAGES_DIR | head -1)"

+else

+ pushd "${FLAGS_from}" && FLAGS_from=`pwd` && popd

fi

if [ -z "${FLAGS_to}" ] ; then

FLAGS_to="${FLAGS_from}"

@@ -170,7 +172,7 @@ sudo dd if=/dev/zero of="${TEMP_IMG}" bs=1 count=1 \

# Set up the partition table

install_gpt "${TEMP_IMG}" "${TEMP_ROOTFS}" "${TEMP_KERN}" "${TEMP_STATE}" \

- "${TEMP_PMBR}" "${TEMP_ESP}" true false ${FLAGS_rootfs_partition_size}

+ "${TEMP_PMBR}" "${TEMP_ESP}" false ${FLAGS_rootfs_partition_size}

# Copy into the partition parts of the file

dd if="${TEMP_ROOTFS}" of="${TEMP_IMG}" conv=notrunc bs=512 \

seek="${START_ROOTFS_A}"

« no previous file with comments | « fixup_image_for_qemu.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698