fixed vm scripts

image_to_vm.sh

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to convert the output of build_image.sh to a VMware image and write a
 # corresponding VMware config file.
 
 # Load common constants.  This should be the first executable line.
@@ skipping 51 matching lines @@
 set -e
 
 if [ -z "${FLAGS_board}" ] ; then
   die "--board is required."
 fi
 
 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}"
 fi
 
 # Use this image as the source image to copy
 SRC_IMAGE="${FLAGS_from}/chromiumos_image.bin"
 
 # If we're asked to modify the image for test, then let's make a copy and
 # modify that instead.
@@ skipping 81 matching lines @@
 cleanup
 
 # Make 3 GiB output image
 TEMP_IMG=$(mktemp)
 # TOOD(adlr): pick a size that will for sure accomodate the partitions
 sudo dd if=/dev/zero of="${TEMP_IMG}" bs=1 count=1 \
   seek=$((${FLAGS_vdisk_size} * 1024 * 1024 - 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}"
 dd if="${TEMP_STATE}"  of="${TEMP_IMG}" conv=notrunc bs=512 \
   seek="${START_STATEFUL}"
 dd if="${TEMP_KERN}"   of="${TEMP_IMG}" conv=notrunc bs=512 \
   seek="${START_KERN_A}"
 dd if="${TEMP_ESP}"    of="${TEMP_IMG}" conv=notrunc bs=512 \
   seek="${START_ESP}"
 
@@ skipping 36 matching lines @@
 guestOS = \"otherlinux\"
 ethernet0.addressType = \"generated\"
 floppy0.present = \"FALSE\""
 
 if [[ "${FLAGS_make_vmx}" = "${FLAGS_TRUE}" ]]; then
   echo "${VMX_CONFIG}" > "${FLAGS_to}/${FLAGS_vmx}"
   echo "Wrote the following config to: ${FLAGS_to}/${FLAGS_vmx}"
   echo "${VMX_CONFIG}"
 fi