cros_image_to_target handles test images, less verbose

cros_generate_update_payload

 #!/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.
 
 # Script to generate a Chromium OS update for use by the update engine.
 # If a source .bin is specified, the update is assumed to be a delta update.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 SRC_MNT=""
 DST_MNT=""
 SRC_KERNEL=""
 SRC_ROOT=""
 DST_KERNEL=""
 DST_ROOT=""
 STATE_MNT=""
 STATE_LOOP_DEV=""
 
 # Pass an arg to not exit 1 at the end
 cleanup() {
   set +e
-  echo "Cleaning up"
+  #echo "Cleaning up"

[adlr, 2010/11/17 20:43:25]

delete the line or the '#'

   if [ -n "$SRC_MNT" ]; then
     sudo umount -d "$SRC_MNT"
     [ -d "$SRC_MNT" ] && rmdir "$SRC_MNT"
     SRC_MNT=""
   fi
   if [ -n "$DST_MNT" ]; then
     sudo umount -d "$DST_MNT"
     [ -d "$DST_MNT" ] && rmdir "$DST_MNT"
     DST_MNT=""
   fi
@@ skipping 27 matching lines @@
   local bs=512
   local sectors_per_two_mib=$((2 * 1024 * 1024 / 512))
   if [ $(( $offset % $sectors_per_two_mib )) -eq 0 -a \
        $(( $length % $sectors_per_two_mib )) -eq 0 ]; then
     bs=$((2 * 1024 * 1024))
     offset=$(($offset / $sectors_per_two_mib))
     length=$(($length / $sectors_per_two_mib))
   else
     warn "partition offset or length not at 2MiB boundary"
   fi
-  dd if="$filename" of="$temp_file" bs=$bs count="$length" skip="$offset"
+  dd if="$filename" of="$temp_file" bs=$bs count="$length" skip="$offset" 2>/dev/null

[adlr, 2010/11/17 20:43:25]

wrap to 80 cols

 }
 
 patch_kernel() {
   local IMAGE="$1"
   local KERN_FILE="$2"
 
+  echo "Patching kernel " $KERN_FILE
+  echo  "   into" $IMAGE

[adlr, 2010/11/17 20:43:25]

delete extra after echo and add one after 'into'?

   STATE_LOOP_DEV=$(sudo losetup -f)
   [ -n "$STATE_LOOP_DEV" ] || die "no free loop device"
   local offset=$(partoffset "${IMAGE}" 1)
   offset=$(($offset * 512))
   sudo losetup -o "$offset" "$STATE_LOOP_DEV" "$IMAGE"
   STATE_MNT=$(mktemp -d /tmp/state.XXXXXX)
   sudo mount --read-only "$STATE_LOOP_DEV" "$STATE_MNT"
-  dd if="$STATE_MNT"/vmlinuz_hd.vblock of="$KERN_FILE" conv=notrunc
+  dd if="$STATE_MNT"/vmlinuz_hd.vblock of="$KERN_FILE" conv=notrunc 2>/dev/null
   sudo umount "$STATE_MNT"
   STATE_MNT=""
   sudo losetup -d "$STATE_LOOP_DEV"
   STATE_LOOP_DEV=""
 }
 
 extract_kern_root() {
   local bin_file="$1"
   local kern_out="$2"
   local root_out="$3"
@@ skipping 54 matching lines @@
   echo Done extracting kernel/root
   exit 0
 fi
 
 DELTA=$FLAGS_TRUE
 [ -n "$FLAGS_output" ] || die \
     "Error: you must specify an output filename with --output FILENAME"
 
 if [ -z "$FLAGS_src_image" ]; then
   DELTA=$FLAGS_FALSE
-  if [ "$FLAGS_old_style" = "$FLAGS_TRUE" ]; then
-    echo "Generating an old-style full update"
-  else
-    echo "Generating a new-style full update"
-  fi
 fi
 
 if [ "$DELTA" -eq "$FLAGS_TRUE" -o "$FLAGS_old_style" -eq "$FLAGS_FALSE" ]; then
   echo "Generating a delta update"
 
   # Sanity check that the real generator exists:
   GENERATOR="$(which delta_generator)"
   [ -x "$GENERATOR" ] || die "can't find delta_generator"
 
   trap cleanup INT TERM EXIT
@@ skipping 39 matching lines @@
 
   trap - INT TERM EXIT
   cleanup noexit
 
   if [ "$DELTA" -eq "$FLAGS_TRUE" ]; then
     echo "Done generating delta."
   else
     echo "Done generating new style full update."
   fi
 else
-  echo "Generating full update"
+  echo "Generating old-style full update"
 
   trap cleanup INT TERM EXIT
   DST_KERNEL=$(extract_partition_to_temp_file "$FLAGS_image" 2)
   if [ "$FLAGS_patch_kernel" -eq "$FLAGS_TRUE" ]; then
     patch_kernel "$FLAGS_image" "$DST_KERNEL"
   fi
   DST_ROOT=$(extract_partition_to_temp_file "$FLAGS_image" 3)
 
   GENERATOR="$(dirname "$0")/mk_memento_images.sh"
 
   CROS_GENERATE_UPDATE_PAYLOAD_CALLED=1 "$GENERATOR" "$DST_KERNEL" "$DST_ROOT"
   mv "$(dirname "$DST_KERNEL")/update.gz" "$FLAGS_output"
 
   trap - INT TERM EXIT
   cleanup noexit
   echo "Done generating full update."
 fi