From 9c5e5ecad3a449e210fd7a210e7bdb16be5b4216 Mon Sep 17 00:00:00 2001
From: Bill Richardson <wfrichar@chromium.org>
Date: Fri, 14 May 2010 17:00:21 -0700
Subject: [PATCH] Use new grub2 variables to boot from the device with the
 bootloader

See http://codereview.chromium.org/2113004/show for details.

This also adds a script to allow manual selection of the preferred image (A or B).

BUG=none

Review URL: http://codereview.chromium.org/2090006
---
 build_image | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/build_image b/build_image
index 2f418bf865..334de6348e 100755
--- a/build_image
+++ b/build_image
@@ -331,25 +331,18 @@ 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"
-set timeout=2
+cat <<'EOF' | sudo dd of="${ESP_DIR}/efi/boot/grub.cfg"
 set default=0
+set timeout=2
 
-menuentry "boot from disk" {
-  linux /efi/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap i915.modeset=1 loglevel=1
+# NOTE: These magic grub variables are a Chrome OS hack. They are not portable.
+
+menuentry "local image A" {
+  linux $grubpartA/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/$linuxpartA ro noresume noswap i915.modeset=1 loglevel=1
 }
 
-menuentry "boot from disk with serial debug" {
-  linux /efi/boot/vmlinuz earlyprintk=serial,ttyS0,115200 console=ttyS0,115200 init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap i915.modeset=1 loglevel=7
-}
-
-menuentry "boot from usb" {
-  linux /efi/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sdb3 ro noresume noswap i915.modeset=1 loglevel=1
-}
-
-menuentry "boot from usb with serial debug" {
-  linux /efi/boot/vmlinuz earlyprintk=serial,ttyS0,115200 console=ttyS0,115200 init=/sbin/init boot=local rootwait root=/dev/sdb3 ro noresume noswap i915.modeset=1 loglevel=7
+menuentry "local image B" {
+  linux $grubpartB/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/$linuxpartB ro noresume noswap i915.modeset=1 loglevel=1
 }
 
 EOF