From 25e4c18e96ec9084f6c58a00cc2bde693508ac7b Mon Sep 17 00:00:00 2001
From: Bill Richardson <wfrichar@chromium.org>
Date: Thu, 17 Jun 2010 12:50:49 -0700
Subject: [PATCH] Add distinct strings to kernel config files to indicate BIOS
 type.

This does nothing, except provide a way to determine which of the three
possible boot methods was used to boot the running image. Handy for
debugging BIOS issues on experimental and dogfood machines.

Review URL: http://codereview.chromium.org/2868010
---
 build_image | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build_image b/build_image
index ec4d75dc52..337726449e 100755
--- a/build_image
+++ b/build_image
@@ -353,12 +353,12 @@ TIMEOUT 0
 label chromeos-usb
   menu label chromeos-usb
   kernel vmlinuz
-  append quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sdb3 ro noresume noswap i915.modeset=1 loglevel=1
+  append quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sdb3 ro noresume noswap i915.modeset=1 loglevel=1 cros_legacy
 
 label chromeos-hd
   menu label chromeos-hd
   kernel vmlinuz
-  append quiet console=tty2 init=/sbin/init boot=local rootwait root=HDROOT ro noresume noswap i915.modeset=1 loglevel=1
+  append quiet console=tty2 init=/sbin/init boot=local rootwait root=HDROOT ro noresume noswap i915.modeset=1 loglevel=1 cros_legacy
 EOF
 
   # Make partition bootable and label it.
@@ -448,15 +448,15 @@ set timeout=2
 # 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
+  linux $grubpartA/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/$linuxpartA ro noresume noswap i915.modeset=1 loglevel=1 cros_efi
 }
 
 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
+  linux $grubpartB/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/$linuxpartB ro noresume noswap i915.modeset=1 loglevel=1 cros_efi
 }
 
 menuentry "Alternate USB Boot" {
-  linux (hd0,3)/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sdb3 ro noresume noswap i915.modeset=1 loglevel=1
+  linux (hd0,3)/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sdb3 ro noresume noswap i915.modeset=1 loglevel=1 cros_efi
 }
 
 EOF
@@ -482,7 +482,7 @@ noresume
 noswap
 i915.modeset=1
 loglevel=7
-Hi_Mom
+cros_secure
 EOF
   
   # FIXME: We need to specify the real keys and certs here!