fix disappearing vmlinuz_hd.vblock problem

fix disappearing vmlinuz_hd.vblock problem

[trchen, 2010-07-08 03:36:07]

the original script mounted stateful partition twice, using a wrong image. the
patch fixed it.

http://codereview.chromium.org/2905001/diff/1/2
File build_image (right):

http://codereview.chromium.org/2905001/diff/1/2#newcode320
build_image:320: if [[ "${ARCH}" = "x86" ]]; then
we already called mount_gpt_images.sh on line 288.
don't have to mount again.

[Randall Spangler, 2010-07-08 03:38:03]

LGTM, thanks!

[Louis, 2010-07-08 04:02:44]

LGTM. Thanks for doing this. I verified the file is copied to
chromeos_image.bin.

[gauravsh, 2010-07-08 04:15:45]

LGTM, and many thanks for figuring this out!

On Wed, Jul 7, 2010 at 8:36 PM,  <trchen@chromium.org> wrote:
> Reviewers: Louis, Randall Spangler, gauravsh,
>
> Message:
> the original script mounted stateful partition twice, using a wrong image.
> the
> patch fixed it.
>
>
> http://codereview.chromium.org/2905001/diff/1/2
> File build_image (right):
>
> http://codereview.chromium.org/2905001/diff/1/2#newcode320
> build_image:320: if [[ "${ARCH}" = "x86" ]]; then
> we already called mount_gpt_images.sh on line 288.
> don't have to mount again.
>
> Description:
> fix disappearing vmlinuz_hd.vblock problem
>
> Please review this at http://codereview.chromium.org/2905001/show
>
> SVN Base: ssh://gitrw.chromium.org/crosutils.git
>
> Affected files:
>  M build_image
>
>
> Index: build_image
> diff --git a/build_image b/build_image
> index
>
23dcf5b477538ee3155d54e3e9e6c7bb0d386784..9b94d99c5647889d739952f3e650b1a238e417a2
> 100755
> --- a/build_image
> +++ b/build_image
> @@ -318,16 +318,7 @@ make_image_bootable() {
>   # create_base_image(). However, it could break the build if it is a clean
>   # build because vmlinuz_hd.vblock hasn't been created by
> build_kernel_image.sh
>   if [[ "${ARCH}" = "x86" ]]; then
> -    STATEFUL_LOOP_DEV=$(sudo losetup -f)
> -    if [ -z "${STATEFUL_LOOP_DEV}" ] ; then
> -      echo "No free loop device. Free up a loop device or reboot. exiting.
> "
> -      exit 1
> -    fi
> -    sudo losetup "${STATEFUL_LOOP_DEV}" "${STATEFUL_FS_IMG}"
> -    sudo mount "${STATEFUL_LOOP_DEV}" "${STATEFUL_FS_DIR}"
>     sudo cp "${OUTPUT_DIR}/vmlinuz_hd.vblock" "${STATEFUL_FS_DIR}"
> -    sudo umount -d "${STATEFUL_FS_DIR}"
> -    STATEFUL_LOOP_DEV=
>   fi
>
>   # START_KERN_A is set by the first call to install the gpt.
>
>
>



-- 
-g