Copy recovery kernel to syslinux path only on x86.

mod_image_for_recovery.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.
 
 # This script modifies a base image to act as a recovery installer.
 # If no kernel image is supplied, it will build a devkeys signed recovery
 # kernel.  Alternatively, a signed recovery kernel can be used to
 # create a Chromium OS recovery image.
@@ skipping 274 matching lines @@
      conv=notrunc
 
   # Set the 'Success' flag to 1 (to prevent the firmware from updating
   # the 'Tries' flag).
   sudo $GPT add -i 2 -S 1 "$RECOVERY_IMAGE"
 
   # Repeat for the legacy bioses.
   # Replace vmlinuz.A with the recovery version
   local sysroot="${FLAGS_build_root}/${FLAGS_board}"
   local vmlinuz="$sysroot/boot/vmlinuz"
-  local esp_offset=$(partoffset "$RECOVERY_IMAGE" 12)
-  local esp_mnt=$(mktemp -d)
-  set +e
   local failed=0
-  sudo mount -o loop,offset=$((esp_offset * 512)) "$RECOVERY_IMAGE" "$esp_mnt"
-  sudo cp "$vmlinuz" "$esp_mnt/syslinux/vmlinuz.A" || failed=1
-  sudo umount -d "$esp_mnt"
-  rmdir "$esp_mnt"
-  set -e
+
+  if [ "$ARCH" == "x86" ]; then

[Will Drewry, 2010/11/29 23:37:16]

I'm pretty sure this should be a single '='.

[dhendrix, 2010/11/29 23:51:37]

Done. I always get confused here since bash allows both '=' and '=='. Maybe ==
is a bash-ism. I'm fine with either, so long as it works.

[Will Drewry, 2010/11/30 19:13:05]

Yup - == should be fine, but = is the more cross-shell friendly variant for
string compares.  Thanks!

+    # There is no syslinux on ARM, so this copy only makes sense for x86.
+    set +e
+    local esp_offset=$(partoffset "$RECOVERY_IMAGE" 12)
+    local esp_mnt=$(mktemp -d)
+    sudo mount -o loop,offset=$((esp_offset * 512)) "$RECOVERY_IMAGE" "$esp_mnt"
+    sudo cp "$vmlinuz" "$esp_mnt/syslinux/vmlinuz.A" || failed=1
+    sudo umount -d "$esp_mnt"
+    rmdir "$esp_mnt"
+    set -e
+  fi
+
   if [ $failed -eq 1 ]; then
     echo "Failed to copy recovery kernel to ESP"
     return 1
   fi
   return 0
 }
 
 maybe_resize_stateful() {
   # If we're not minimizing, then just copy and go.
   if [ $FLAGS_minimize_image -eq $FLAGS_FALSE ]; then
@@ skipping 101 matching lines @@
 
 trap cleanup EXIT
 
 maybe_resize_stateful  # Also copies the image if needed.
 
 install_recovery_kernel
 
 echo "Recovery image created at $RECOVERY_IMAGE"
 print_time_elapsed
 trap - EXIT