Replace "mount -o loop" with explict losetup use in build_image.

src/scripts/build_image

 #!/bin/bash
 
 # Copyright (c) 2009 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 build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 53 matching lines @@
 OUTPUT_DIR="${FLAGS_output_root}/${FLAGS_board}/${IMAGE_SUBDIR}"
 ROOT_FS_DIR="${OUTPUT_DIR}/rootfs"
 ROOT_FS_IMG="${OUTPUT_DIR}/rootfs.image"
 OUTPUT_IMG=${FLAGS_to:-${OUTPUT_DIR}/chromiumos_image.bin}
 
 BOARD="${FLAGS_board}"
 BOARD_ROOT="${FLAGS_build_root}/${BOARD}"
 
 LOOP_DEV=
 STATEFUL_LOOP_DEV=
+ESP_LOOP_DEV=
 
 # What cross-build are we targeting?
 . "${BOARD_ROOT}/etc/make.conf.board_setup"
 LIBC_VERSION=${LIBC_VERSION:-"2.10.1-r1"}
 
 # Figure out ARCH from the given toolchain.
 # TODO: Move to common.sh as a function after scripts are switched over.
 TC_ARCH=$(echo "$CHOST" | awk -F'-' '{ print $1 }')
 case "$TC_ARCH" in
   arm*)
@@ skipping 36 matching lines @@
 cleanup_stateful_fs_loop() {
   sudo umount "${ROOT_FS_DIR}/usr/local"
   sudo umount "${ROOT_FS_DIR}/var"
   sudo umount "${STATEFUL_DIR}"
   sleep 1  # follows from cleanup_root_fs_loop.
   sudo losetup -d "$STATEFUL_LOOP_DEV"
 }
 
 cleanup_esp_loop() {
   sudo umount "$ESP_DIR"
+  sleep 1  # me belong cargo

[adlr, 2010/04/08 18:22:26]

write a better comment?

[Bill Richardson, 2010/04/08 18:23:48]

I *knew* you'd say something about this!

+  sudo losetup -d "$ESP_LOOP_DEV"
 }
 
 cleanup() {
   # Disable die on error.
   set +e
 
   if [[ -n "$STATEFUL_LOOP_DEV" ]]; then
     cleanup_stateful_fs_loop
   fi
 
   if [[ -n "$LOOP_DEV" ]]; then
     cleanup_rootfs_loop
   fi
 
-  if [[ -n "$ESP_DIR" ]]; then
+  if [[ -n "$ESP_LOOP_DEV" ]]; then
     cleanup_esp_loop
   fi
 
   # Turn die on error back on.
   set -e
 }
 
 # ${DEV_IMAGE_ROOT} specifies the location of where developer packages will
 # be installed on the stateful dir.  On a Chromium OS system, this will
 # translate to /usr/local
@@ skipping 183 matching lines @@
 
 # Create EFI System Partition to boot stock EFI BIOS (but not ChromeOS EFI
 # BIOS). We only need this for x86, but it's simpler and safer to keep the disk
 # images the same for both x86 and ARM.
 ESP_IMG=${OUTPUT_DIR}/esp.image
 # NOTE: The size argument for mkfs.vfat is in 1024-byte blocks. We'll hard-code
 # it to 16M for now.
 ESP_BLOCKS=16384
 /usr/sbin/mkfs.vfat -C ${OUTPUT_DIR}/esp.image ${ESP_BLOCKS}
 ESP_DIR=${OUTPUT_DIR}/esp
-mkdir -p ${ESP_DIR}
-sudo mount -o loop ${ESP_IMG} ${ESP_DIR}
-sudo mkdir -p ${ESP_DIR}/efi/boot
-sudo grub-mkimage -p /efi/boot -o ${ESP_DIR}/efi/boot/bootx64.efi \
+ESP_LOOP_DEV=$(sudo losetup -f)
+if [ -z "$ESP_LOOP_DEV" ] ; then
+  echo "No free loop device.  Free up a loop device or reboot.  exiting. "
+  exit 1
+fi
+mkdir -p "${ESP_DIR}"
+sudo losetup "${ESP_LOOP_DEV}" "${ESP_IMG}"
+sudo mount "${ESP_LOOP_DEV}" "${ESP_DIR}"
+sudo mkdir -p "${ESP_DIR}/efi/boot"
+sudo grub-mkimage -p /efi/boot -o "${ESP_DIR}/efi/boot/bootx64.efi" \
   part_gpt fat ext2 normal boot sh chain configfile linux
-sudo cp ${ROOT_FS_DIR}/boot/vmlinuz ${ESP_DIR}/efi/boot/vmlinuz
-cat <<EOF | sudo dd of=${ESP_DIR}/efi/boot/grub.cfg
+sudo cp "${ROOT_FS_DIR}/boot/vmlinuz" "${ESP_DIR}/efi/boot/vmlinuz"
+cat <<EOF | sudo dd of="${ESP_DIR}/efi/boot/grub.cfg"
 set timeout=2
 set default=0
 
-menuentry "32-bit serial" {
+menuentry "serial debug" {
   linux /efi/boot/vmlinuz earlyprintk=serial,ttyS0,115200 i915.modeset=0 console=ttyS0,115200 acpi=off init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap loglevel=7
 }
+
+menuentry "normal" {
+  linux /efi/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap i915.modeset=1 loglevel=1
+}
+
 EOF
 
 # Enable dev mode on the target system and re-run ldconfig
 # for rootfs's ld.so.cache
 if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
   # Flag will mount /usr/local on target device
   sudo mkdir -p "$ROOT_FS_DIR/root"
   sudo touch "$ROOT_FS_DIR/root/.dev_mode"
 
   # Re-run ldconfig to fix /etc/ldconfig.so.cache
@@ skipping 34 matching lines @@
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${IMAGE_SUBDIR}"
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdb"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."
 
 trap - EXIT