make_developer_script_runner.sh: fix using full-sized kernels

make_developer_script_runner.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 a developer payload is supplied, it will be used.
 # It is very straight forward, top to bottom to show clearly what is
 # little is needed to create a developer shim to run a signed script.
@@ skipping 47 matching lines @@
 
 header_offset=34
 stateful_sectors=$(((FLAGS_statefulfs_size * 1024 * 1024) / 512))
 stateful_sectors=$(roundup $stateful_sectors)
 
 if [ -b "$FLAGS_image" ]; then
   sudo=sudo
 else
   max_kern_size=32768
   dd if=/dev/zero of="${FLAGS_image}" bs=512 count=0 \
-     seek=$((1 + max_kern_size + header_offset + stateful_sectors))
+     seek=$((1 + max_kern_size + (2 * header_offset) + stateful_sectors))
   sudo=""
 fi
 
 ## STATEFUL
 
 stateful_image=$(mktemp)
 trap "rm $stateful_image" EXIT
 
 dd if=/dev/zero of="$stateful_image" bs=512 \
     seek=$stateful_sectors count=0
@@ skipping 13 matching lines @@
 sudo umount -d "$stateful_mnt"
 rmdir "$stateful_mnt"
 
 ## GPT
 
 kernel_bytes=$(stat -c '%s' $FLAGS_kernel_image)
 kernel_sectors=$((kernel_bytes / 512))
 kernel_sectors=$(roundup $kernel_sectors)
 
 $sudo $GPT create $FLAGS_image
-trap "rm $FLAGS_image" ERR
+trap "rm $FLAGS_image; echo 'An error occurred! Rerun with -v for details.'" ERR
 
 offset=$header_offset
 $sudo $GPT add -b $offset -s $stateful_sectors \
                -t data -l "STATE" $FLAGS_image
 $sudo dd if=$stateful_image of=$FLAGS_image bs=512 conv=notrunc \
          seek=$offset count=$stateful_sectors
 
 offset=$((offset + stateful_sectors))
 $sudo $GPT add -b $offset -s $kernel_sectors \
                -t kernel -l "KERN-A" -S 0 -T 15 -P 15 $FLAGS_image
 $sudo dd if=$FLAGS_kernel_image of=$FLAGS_image bs=512 conv=notrunc \
          seek=$offset count=$kernel_sectors
 # The kernel will ignore GPT without a legacymbr.
 PMBRCODE=$(readlink -f /usr/share/syslinux/gptmbr.bin)
 # Have it legacy boot off of stateful, not that it should matter.
 $sudo $GPT boot -p -b "$PMBRCODE" -i 1 $FLAGS_image 1>&2
 
 $sudo $GPT show $FLAGS_image
 
-echo "Done."
+echo "Emitted $FLAGS_image successfully!"