fix for issue 2610

src/platform/installer/chromeos-common.sh

 # 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 contains common constants and functions for installer scripts. This must
 # evaluate properly for both /bin/bash and /bin/sh, since it's used both to
 # create the initial image at compile time and to install or upgrade a running
 # image.
 
 # Here are the GUIDs we'll be using to identify various partitions. NOTE: The
@@ skipping 112 matching lines @@
 #   START_ROOTFS_B
 #   START_STATEFUL
 install_gpt() {
   local outdev=$1
   local rootfs_img=$2
   local kernel_img=$3
   local stateful_img=$4
   local pmbrcode=$5
   local esp_img=$6
   local force_full="${7:-}"
+  local recovery="${8:-}"
 
   # The gpt tool requires a fixed-size target to work on, so we may have to
   # create a file of the appropriate size. Let's figure out what that size is
   # now. The full partition layout will look something like this (indented
   # lines indicate reserved regions that do not have any useful content at the
   # moment).
   #
   #   PMBR (512 bytes)
   #   Primary GPT Header (512 bytes)
   #   Primary GPT Table (16K)
@@ skipping 102 matching lines @@
     NUM_KERN_SECTORS=$(roundup $(numsectors $kernel_img))
     local num_kern_a_sectors=$NUM_KERN_SECTORS
     local num_kern_b_sectors=1
     NUM_ROOTFS_SECTORS=$(roundup $(numsectors $rootfs_img))
     local num_rootfs_a_sectors=$NUM_ROOTFS_SECTORS
     local num_rootfs_b_sectors=1
     NUM_OEM_SECTORS=$max_oem_sectors
     NUM_ESP_SECTORS=$(roundup $(numsectors $esp_img))
     NUM_RESERVED_SECTORS=1
 
+    # For recovery image, use max sizes and create both A & B images
+    if [ ${FLAGS_recovery} -eq $FLAGS_TRUE ]; then
+      NUM_KERN_SECTORS=$max_kern_sectors
+      num_kern_a_sectors=$NUM_KERN_SECTORS
+      num_kern_b_sectors=$NUM_KERN_SECTORS
+
+      NUM_ROOTFS_SECTORS=$max_rootfs_sectors
+      num_rootfs_a_sectors=$NUM_ROOTFS_SECTORS
+      num_rootfs_b_sectors=$NUM_ROOTFS_SECTORS
+    fi
+
     START_KERN_A=$start_useful
     START_ROOTFS_A=$(($START_KERN_A + $NUM_KERN_SECTORS))
     START_STATEFUL=$(($START_ROOTFS_A + $NUM_ROOTFS_SECTORS))
     START_OEM=$(($START_STATEFUL + $NUM_STATEFUL_SECTORS))
     START_ESP=$(($START_OEM + $NUM_OEM_SECTORS))
     START_KERN_B=$(($START_ESP + $NUM_ESP_SECTORS))
-    START_ROOTFS_B=$((START_KERN_B + $num_kern_b_sectors))
+    START_ROOTFS_B=$(($START_KERN_B + $num_kern_b_sectors))
     START_RESERVED=$(($START_ROOTFS_B + $num_rootfs_b_sectors))
 
     # For minimal install, we're not worried about the secondary GPT header
     # being at the end of the device because we're almost always writing to a
     # file. If that's not true, the secondary will just be invalid.
     local start_gpt_footer=$(($START_RESERVED + $NUM_RESERVED_SECTORS))
     local end_useful=$start_gpt_footer
 
     local total_sectors=$(($start_gpt_footer + $num_footer_sectors))
 
@@ skipping 219 matching lines @@
 # The scripts that source this file typically want to use the root password as
 # confirmation, unless the --run_as_root flag is given.
 dont_run_as_root() {
   if [ $(id -u) -eq "0" -a "${FLAGS_run_as_root}" -eq "${FLAGS_FALSE}" ]
   then
     echo "Note: You must be the 'chronos' user to run this script. Unless"
     echo "you pass --run_as_root and run as root."
     exit 1
   fi
 }