Update scripts for vm's

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.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 . "$(dirname "$0")/chromeos-common.sh"
 
 get_default_board
+assert_inside_chroot
 
+DEFAULT_MEM="1024"
 DEFAULT_VMDK="ide.vmdk"
 DEFAULT_VMX="chromiumos.vmx"
 DEFAULT_VBOX_DISK="os.vdi"
 DEFAULT_QEMU_IMAGE="chromiumos_qemu_image.bin"
 
+# Minimum sizes for full size vm images -- needed for update.
+MIN_VDISK_SIZE_FULL=6072
+MIN_STATEFUL_FS_SIZE_FULL=2048
+
 MOD_SCRIPTS_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" \
   "Board for which the image was built"
 DEFINE_boolean factory $FLAGS_FALSE \
     "Modify the image for manufacturing testing"
 DEFINE_boolean factory_install $FLAGS_FALSE \
     "Modify the image for factory install shim"
 DEFINE_boolean force_copy ${FLAGS_FALSE} "Always rebuild test image"
 DEFINE_string format "qemu" \
   "Output format, either qemu, vmware or virtualbox"
 DEFINE_string from "" \
   "Directory containing rootfs.image and mbr.image"
+DEFINE_boolean full "${FLAGS_FALSE}" "Build full image with all partitions."
 DEFINE_boolean make_vmx ${FLAGS_TRUE} \
   "Create a vmx file for use with vmplayer (vmware only)."
 DEFINE_integer mem "${DEFAULT_MEM}" \
   "Memory size for the vm config in MBs (vmware only)."
 DEFINE_integer rootfs_partition_size 1024 \
   "rootfs parition size in MBs."
 DEFINE_string state_image "" \
   "Stateful partition image (defaults to creating new statful partition)"
 DEFINE_integer statefulfs_size -1 \
   "Stateful partition size in MBs."
@@ skipping 14 matching lines @@
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Die on any errors.
 set -e
 
 if [ -z "${FLAGS_board}" ] ; then
   die "--board is required."
 fi
 
+if [ "${FLAGS_full}" -eq "${FLAGS_TRUE}" ] && \
+    ( [[ ${FLAGS_vdisk_size} < ${MIN_VDISK_SIZE_FULL} ]] || \
+      [[ ${FLAGS_statefulfs_size} < ${MIN_STATEFUL_FS_SIZE_FULL} ]]); then
+  die "Disk is too small for full, please select a vdisk size greater than \
+${MIN_VDISK_SIZE_FULL} and statefulfs size greater than \
+${MIN_STATEFUL_FS_SIZE_FULL}."
+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
@@ skipping 27 matching lines @@
       "${FLAGS_from}/chromiumos_test_image.bin" ${EXTRA_ARGS} --yes
     echo "Done with mod_image_for_test."
   else
     echo "Using cached test image."
   fi
   SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
   echo "Source test image is: ${SRC_IMAGE}"
 fi
 
 # Memory units are in MBs
-DEFAULT_MEM="1024"
 TEMP_IMG="$(dirname ${SRC_IMAGE})/vm_temp_image.bin"
 
 # If we're not building for VMWare, don't build the vmx
 if [ "${FLAGS_format}" != "vmware" ]; then
   FLAGS_make_vmx="${FLAGS_FALSE}"
 fi
 
 # Convert args to paths.  Need eval to un-quote the string so that shell
 # chars like ~ are processed; just doing FOO=`readlink -f $FOO` won't work.
 FLAGS_from=`eval readlink -f $FLAGS_from`
@@ skipping 47 matching lines @@
   sudo umount -d "${TEMP_ESP_MNT}"
   rmdir "${TEMP_MNT}" "${TEMP_ESP_MNT}"
 }
 trap cleanup INT TERM EXIT
 mkdir -p "${TEMP_MNT}"
 sudo mount -o loop "${TEMP_ROOTFS}" "${TEMP_MNT}"
 mkdir -p "${TEMP_ESP_MNT}"
 sudo mount -o loop "${TEMP_ESP}" "${TEMP_ESP_MNT}"
 
 if [ "${FLAGS_format}" = "qemu" ]; then
-  sudo python ./fixup_image_for_qemu.py --mounted_dir="${TEMP_MNT}" \
-  --enable_tablet=true
+  sudo python "$(dirname $0)/fixup_image_for_qemu.py" \
+      --mounted_dir="${TEMP_MNT}" \
+      --enable_tablet=true
 else
-  sudo python ./fixup_image_for_qemu.py --mounted_dir="${TEMP_MNT}" \
-  --enable_tablet=false
+  sudo python "$(dirname $0)/fixup_image_for_qemu.py" \
+      --mounted_dir="${TEMP_MNT}" \
+      --enable_tablet=false
 fi
 
 # Modify the unverified usb template which uses a default usb_disk of sdb3
 sudo sed -i -e 's/sdb3/sda3/g' "${TEMP_MNT}/boot/syslinux/usb.A.cfg"
 
 # Unmount everything prior to building a final image
 sync
 trap - INT TERM EXIT
 cleanup
 
-# Make 3 GiB output image
-# TOOD(adlr): pick a size that will for sure accomodate the partitions
+# TOOD(adlr): pick a size that will for sure accomodate the partitions.
 dd if=/dev/zero of="${TEMP_IMG}" bs=1 count=1 \
   seek=$((${FLAGS_vdisk_size} * 1024 * 1024 - 1))
 
+GPT_FULL="false"
+[ "${FLAGS_full}" -eq "${FLAGS_TRUE}" ] && GPT_FULL="true"
+
 # Set up the partition table
 install_gpt "${TEMP_IMG}" "$(numsectors $TEMP_ROOTFS)" \
   "$(numsectors $TEMP_STATE)" "${TEMP_PMBR}" "$(numsectors $TEMP_ESP)" \
-  false ${FLAGS_rootfs_partition_size}
+  "${GPT_FULL}" ${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 44 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