Fixes for cbuild to work with ctest.

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 145 matching lines @@
     STATEFUL_LOOP_DEV=$(sudo losetup -f)
     if [ -z "${STATEFUL_LOOP_DEV}" ]; then
       die "No free loop device. Free up a loop device or reboot. Exiting."
     fi
 
     # Extend the original file size to the new size.
     dd if=/dev/zero of="${TEMP_STATE}" bs=1 count=1 \
         seek=$((STATEFUL_SIZE_BYTES - 1))
     # Resize the partition.
     sudo losetup "${STATEFUL_LOOP_DEV}" "${TEMP_STATE}"
-    sudo e2fsck -f "${STATEFUL_LOOP_DEV}"
+    sudo e2fsck -pf "${STATEFUL_LOOP_DEV}"
     sudo resize2fs "${STATEFUL_LOOP_DEV}"
     sudo losetup -d "${STATEFUL_LOOP_DEV}"
   fi
 fi
 TEMP_PMBR="${TEMP_DIR}"/pmbr
 dd if="${SRC_IMAGE}" of="${TEMP_PMBR}" bs=512 count=1
 
 TEMP_MNT=$(mktemp -d)
 TEMP_ESP_MNT=$(mktemp -d)
 cleanup() {
@@ skipping 100 matching lines @@
   echo "${VMX_CONFIG}"
 fi
 
 
 if [ "${FLAGS_format}" == "qemu" ]; then
   echo "If you have qemu-kvm installed, you can start the image by:"
   echo "sudo kvm -m ${FLAGS_mem} -vga std -pidfile /tmp/kvm.pid -net nic " \
        "-net user,hostfwd=tcp::922-:22 \\"
   echo "        -hda ${FLAGS_to}/${DEFAULT_QEMU_IMAGE}"
 fi