mod_image_for_recovery: supprt new recovery model

resize_stateful_partition.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.
 
 # Utility methods used to resize a stateful partition and update the GPT table
 
 # Source constants and utility functions
 . "$(dirname "$0")/common.sh"
@@ skipping 46 matching lines @@
   echo "${resized_sectors}"
 }
 
 # Update partition table with resized stateful partition
 update_partition_table() {
   local src_img=$1          # source image
   local temp_state=$2       # stateful partition image
   local resized_sectors=$3  # number of sectors in resized stateful partition
   local temp_img=$4
 
-  local kernel_offset=$(partoffset ${src_img} 2)
-  local kernel_count=$(partsize ${src_img} 2)
+  local kern_a_offset=$(partoffset ${src_img} 2)
+  local kern_a_count=$(partsize ${src_img} 2)
+  local kern_b_offset=$(partoffset ${src_img} 4)
+  local kern_b_count=$(partsize ${src_img} 4)
   local rootfs_offset=$(partoffset ${src_img} 3)
   local rootfs_count=$(partsize ${src_img} 3)
   local oem_offset=$(partoffset ${src_img} 8)
   local oem_count=$(partsize ${src_img} 8)
   local esp_offset=$(partoffset ${src_img} 12)
   local esp_count=$(partsize ${src_img} 12)
 
   local temp_pmbr=$(mktemp "/tmp/pmbr.XXXXXX")
   dd if="${src_img}" of="${temp_pmbr}" bs=512 count=1 &>/dev/null
 
   trap "rm -rf \"${temp_pmbr}\"" EXIT
   # Set up a new partition table
   install_gpt "${temp_img}" "${rootfs_count}" "${resized_sectors}" \
-    "${temp_pmbr}" "${esp_count}" false $(roundup ${rootfs_count})
+    "${temp_pmbr}" "${esp_count}" false \
+    $(((rootfs_count * 512)/(1024 * 1024)))
 
   # Copy into the partition parts of the file
   dd if="${src_img}" of="${temp_img}" conv=notrunc bs=512 \
     seek="${START_ROOTFS_A}" skip=${rootfs_offset} count=${rootfs_count}
   dd if="${temp_state}" of="${temp_img}" conv=notrunc bs=512 \
     seek="${START_STATEFUL}"
   # Copy the full kernel (i.e. with vboot sections)
   dd if="${src_img}" of="${temp_img}" conv=notrunc bs=512 \
-    seek="${START_KERN_A}" skip=${kernel_offset} count=${kernel_count}
+    seek="${START_KERN_A}" skip=${kern_a_offset} count=${kern_a_count}
+  dd if="${src_img}" of="${temp_img}" conv=notrunc bs=512 \
+    seek="${START_KERN_B}" skip=${kern_b_offset} count=${kern_b_count}
   dd if="${src_img}" of="${temp_img}" conv=notrunc bs=512 \
     seek="${START_OEM}" skip=${oem_offset} count=${oem_count}
   dd if="${src_img}" of="${temp_img}" conv=notrunc bs=512 \
     seek="${START_ESP}" skip=${esp_offset} count=${esp_count}
 }