Use max-size kernel partition on USB image, too.

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.
 
 # The GPT tables describe things in terms of 512-byte sectors, but some
@@ skipping 141 matching lines @@
   # an existing partition, 2) we want to be able to add new partitions later
   # without breaking current scripts, and 3) we may someday need to increase
   # the size of the rootfs during an upgrade, which means shrinking the size of
   # the stateful partition on a live system.
   #
   # The EFI GPT spec requires that all valid partitions be at least one sector
   # in size, and non-overlapping.
 
   # Here are the size limits that we're currently requiring
   local max_kern_sectors=32768        # 16M
-  # Verified boot adds 64KB of .vblock at the beginning of
-  # the kernel and ~20KB at the end.  Add some padding to handle this.
-  local num_vboot_sectors=512         # 256K
   local max_rootfs_sectors=$((${rootfs_size} * 2 * 1024))  # 1G by default
   local max_oem_sectors=32768         # 16M
   local max_reserved_sectors=131072   # 64M
   local max_esp_sectors=32768         # 16M
   local min_stateful_sectors=262144   # 128M, expands to fill available space
 
   local num_pmbr_sectors=1
   local num_gpt_hdr_sectors=1
   local num_gpt_table_sectors=32      # 16K
   local num_footer_sectors=$(($num_gpt_hdr_sectors + $num_gpt_table_sectors))
@@ skipping 56 matching lines @@
     NUM_STATEFUL_SECTORS=$(($START_ROOTFS_B - $START_STATEFUL))
   else
     # Just a local file.
     local sudo=
 
     # We're just going to fill partitions 1, 2, 3, 8, and 12. The others will
     # be present but as small as possible. The disk layout isn't crucial here,
     # because we won't be able to upgrade this image in-place as it's only for
     # installation purposes.
     NUM_STATEFUL_SECTORS=$(roundup $(numsectors $stateful_img))
-    # Need to make room for kernel, key, preamble, added by key management.
-    NUM_KERN_SECTORS=$(roundup \
-         $(($num_vboot_sectors + $(numsectors $kernel_img))))
+    NUM_KERN_SECTORS=$max_kern_sectors
     local num_kern_a_sectors=$NUM_KERN_SECTORS
     local kern_a_priority=15
     local num_kern_b_sectors=1
     local kern_b_priority=0
     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
@@ skipping 211 matching lines @@
   local dev_path=/sys/block/${1}/device
   while [ -d "${dev_path}" -a "${dev_path}" != "/sys" ]; do
     if [ -f "${dev_path}/${2}" ]; then
       cat "${dev_path}/${2}"
       return
     fi
     dev_path=$(readlink -f ${dev_path}/..)
   done
   echo '[Unknown]'
 }