From 8d87dbfb281ba552e71cffb0188cc9de5bfbcd37 Mon Sep 17 00:00:00 2001
From: Elly Jones <ellyjones@chromium.org>
Date: Thu, 23 Jun 2011 13:12:53 -0400
Subject: [PATCH] mod_image_for_recovery: be noisy if build_kernel_image fails.

This will prevent nasty surprises when it fails silently and one ends up with a
non-bootable recovery image.

BUG=chromium-os:16366
TEST=Adhoc
Hack /usr/lib/crosutils/build_kernel_image.sh to exit 1, run
mod_image_for_recovery

Change-Id: If23d181959aecf75044cb4581e25f8851d1b9840
Signed-off-by: Elly Jones <ellyjones@chromium.org>
Reviewed-on: http://gerrit.chromium.org/gerrit/3097
Reviewed-by: Will Drewry <wad@chromium.org>
---
 mod_image_for_recovery.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index 3fb0e119f3..12d54400ba 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -171,16 +171,33 @@ get_install_vblock() {
   echo "$out"
 }
 
+failboat() {
+# http://www.chris.com/ascii/index.php?art=transportation/nautical
+  echo -e "${V_BOLD_RED}"
+  cat <<BOAT
+             .  o ..
+     o . o o.o
+          ...oo
+            __[]__
+         __|_o_o_o\__
+         \""""""""""/
+          \   FAIL /
+     ^^^^^^^^^^^^^^^^^^^^
+BOAT
+  echo -e "${V_VIDOFF}"
+  die "$* failed"
+}
+
 emerge_recovery_kernel() {
   echo "Emerging custom recovery initramfs and kernel"
   local emerge_flags="-uDNv1 --usepkg=n --selective=n"
 
   $EMERGE_BOARD_CMD \
     $emerge_flags --binpkg-respect-use=y \
-    chromeos-initramfs || die "no initramfs"
+    chromeos-initramfs || failboat "emerge initramfs"
   USE="fbconsole initramfs" $EMERGE_BOARD_CMD \
                     $emerge_flags --binpkg-respect-use=y \
-                    virtual/kernel
+                    virtual/kernel || failboat "emerge kernel"
 }
 
 create_recovery_kernel_image() {
@@ -252,7 +269,7 @@ create_recovery_kernel_image() {
     --keys_dir="${FLAGS_keys_dir}" \
     --nouse_dev_keys \
     ${crosbug12352_flag} \
-    ${verity_args} 1>&2
+    ${verity_args} 1>&2 || failboat "build_kernel_image"
   sudo rm "$FLAGS_rootfs_hash"
   sudo losetup -d "$root_dev"
   trap - RETURN