Clean up cros_make_image_bootable and image_to_vm

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 97 matching lines @@
     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_IMAGE="${IMAGES_DIR}/temp_image.img"
-
+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`
 FLAGS_to=`eval readlink -f $FLAGS_to`
@@ skipping 52 matching lines @@
 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
 else
   sudo python ./fixup_image_for_qemu.py --mounted_dir="${TEMP_MNT}" \
   --enable_tablet=false
 fi
-# Remount read-only so that when we call setimage, it will recreate correct
-# boot hashes for verifying the rootfs integrity.  This is a bit of a cheat
-# but it will have to do.  We don't assume legacy bootloaders are secure so
-# we update the hash too, but the hash in part_2 doesn't change which would
-# cause failures on a Chrome OS boot (without re-running build_kernel_image).
-sudo mount -o remount,ro "${TEMP_MNT}"
+
+# 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
-
-# Check if the current image was build with --enable_rootfs_verification
-enable_rootfs_verification=
-if grep -qE '^chromeos-v' "${TEMP_ESP_MNT}"/syslinux/default.cfg; then
-  enable_rootfs_verification=--enable_rootfs_verification
-fi
-
-# Update the bootloader and verified hashes for the given rootfs in the
-# vm and fixup changes.
-DST_DEV=/dev/sda
-BOOT_SLOT=A
-syslinux_cfg="${TEMP_MNT}/boot/syslinux/root.${BOOT_SLOT}.cfg"
-grub_cfg="${TEMP_MNT}/boot/efi/boot/grub.cfg"
-sudo "${TEMP_MNT}"/usr/sbin/chromeos-setimage ${BOOT_SLOT} \
-          --dst=${DST_DEV} --run_as_root \
-          --update_syslinux_cfg="${syslinux_cfg}" \
-          --update_grub_cfg="${grub_cfg}" \
-          --rootfs_image="${TEMP_ROOTFS}" \
-          --esp_mounted_at="${TEMP_ESP_MNT}" \
-          --kernel_image="${TEMP_KERN}" \
-          --update_vmlinuz=${TEMP_MNT}/boot/vmlinuz \
-          ${enable_rootfs_verification}
-
 trap - INT TERM EXIT
 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 \
+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}" "$(numsectors $TEMP_ROOTFS)" \
   "$(numsectors $TEMP_STATE)" "${TEMP_PMBR}" "$(numsectors $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}"
 
+# Make the built-image bootable and ensure that the legacy default usb boot
+# uses /dev/sda instead of /dev/sdb3.
+# NOTE: The TEMP_IMG must live in the same image dir as the original image
+#       to operate automatically below.
+${SCRIPTS_DIR}/bin/cros_make_image_bootable $(dirname "${TEMP_IMG}") \
+                                            $(basename "${TEMP_IMG}") \
+                                            --usb_disk /dev/sda3
+
 echo Creating final image
 # Convert image to output format
 if [ "${FLAGS_format}" = "virtualbox" -o "${FLAGS_format}" = "qemu" ]; then
   if [ "${FLAGS_format}" = "virtualbox" ]; then
     VBoxManage convertdd "${TEMP_IMG}" "${FLAGS_to}/${FLAGS_vbox_disk}"
   else
     mv ${TEMP_IMG} ${FLAGS_to}/${DEFAULT_QEMU_IMAGE}
   fi
 elif [ "${FLAGS_format}" = "vmware" ]; then
   qemu-img convert -f raw "${TEMP_IMG}" \
@@ skipping 26 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