Update factory installer, factory test

src/platform/memento_softwareupdate/memento_updater.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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 is the autoupdater for Memento. When called it consults Omaha to see
 # if there's an update available. If so, it downloads it to the other
 # partition on the Memento USB stick, then alters the MBR and partitions
 # as needed so the next reboot will boot into the newly installed partition.
@@ skipping 59 matching lines @@
 
 if [ -z "${FLAGS_dst_partition}" ]; then
   # make sure update hasn't already completed
   UPDATED_COMPLETED_FILE="/tmp/memento_autoupdate_completed"
   if [ -f "$UPDATED_COMPLETED_FILE" ]
   then
     exit 0
   fi
 fi
 
-if ( set -o noclobber; echo "$$" > "$PID_FILE") 2> /dev/null; 
+if ( set -o noclobber; echo "$$" > "$PID_FILE") 2> /dev/null;
 then
   true
 else
-  log "Failed to acquire lockfile: $PID_FILE." 
+  log "Failed to acquire lockfile: $PID_FILE."
   log "Held by $(cat $PID_FILE)"
   exit 1
 fi
 # remove lockfile when we exit
 trap 'rm -f "$PID_FILE"; log Memento AutoUpdate terminating; exit $?' \
     INT TERM EXIT
 
 log Memento AutoUpdate starting
 
 # See if we're forcing an update from a specific URL
@@ skipping 50 matching lines @@
 LOCAL_DEV=$(rootdev)
 
 # We install onto the other partition so if we end in 3, other ends in 5, and
 # vice versa
 if [ -n "${FLAGS_dst_partition}" ]; then
   INSTALL_DEV="${FLAGS_dst_partition}"
 else
   INSTALL_DEV=$(echo $LOCAL_DEV | tr '35' '53')
 fi
 NEW_PART_NUM=${INSTALL_DEV##*/*[a-z]}
-# The kernel needs to be installed to its own partition. 
+# The kernel needs to be installed to its own partition.
 # partitions 2&3 are image A, partitions 4&5 are image B.
 if [ -z "${FLAGS_kernel_partition}" ]; then
   KINSTALL_DEV=$(echo $INSTALL_DEV | tr '35' '24')
 else
   KINSTALL_DEV="${FLAGS_kernel_partition}"
 fi
 
 if [ "$KINSTALL_DEV" = "$INSTALL_DEV" ]; then
   log "kernel install partition the same as rootfs install partition!"
   log "  (${KINSTALL_DEV})"
   exit 1
 fi
 
 # Find whole disk device.
 ROOT_DEV=${INSTALL_DEV%%[0-9]*}
 
 # Do some device sanity checks.
-if ! expr match "$LOCAL_DEV" '^/dev/[a-z][a-z]*[123458]$' > /dev/null
+if [ ! -b "$LOCAL_DEV" ]
 then
   log "didnt find good local device. local: $LOCAL_DEV install: $INSTALL_DEV"
   exit 1
 fi
-if ! expr match "$INSTALL_DEV" '^/dev/[a-z][a-z]*[123458]$' > /dev/null
+if [ ! -b "$INSTALL_DEV" ]
 then
   log "didnt find good install device. local: $LOCAL_DEV install: $INSTALL_DEV"
   exit 1
 fi
 if [ "$LOCAL_DEV" == "$INSTALL_DEV" ]
 then
   log local and installation device are the same: "$LOCAL_DEV"
   exit 1
 fi
 
@@ skipping 88 matching lines @@
 function abort_update_if_cmd_failed {
   abort_update_if_cmd_failed_long "$?" "!!"
 }
 
 if [ $FLAGS_skip_postinst -eq $FLAGS_FALSE ]; then
   # tell the new image to make itself "ready"
   log running postinst on the downloaded image
   MOUNTPOINT=/tmp/newpart
   mkdir -p "$MOUNTPOINT"
   mount "$INSTALL_DEV" "$MOUNTPOINT"
-  
+
   # Check version of new software if not forcing a dst partition
   if [ -z "${FLAGS_dst_partition}" ]; then
     NEW_VERSION=$(grep ^GOOGLE_RELEASE "$MOUNTPOINT"/etc/lsb-release | \
                   cut -d = -f 2-)
     if [ "x$NEW_VERSION" = "x" ]
     then
       log "Can't find new version number. aborting update"
       umount "$MOUNTPOINT"
       rmdir "$MOUNTPOINT"
       exit 1
     else
       # See if it's newer than us
       if [ "${FLAGS_force_update}" != "${FLAGS_TRUE}" ] &&
         version_number_greater_than "$APP_VERSION" "$NEW_VERSION"
       then
         log "Can't upgrade to older version: " "$NEW_VERSION"
         umount "$MOUNTPOINT"
         rmdir "$MOUNTPOINT"
         exit 1
       fi
     fi
   fi
-  
+
   "$MOUNTPOINT"/postinst "$INSTALL_DEV" 2>&1 | cat >> "$MEMENTO_AU_LOG"
   [ "${PIPESTATUS[*]}" = "0 0" ]
   POSTINST_RETURN_CODE=$?
   umount "$MOUNTPOINT"
   rmdir "$MOUNTPOINT"
-  
+
   # If it failed, don't update MBR but just to be safe, zero out a page of
   # install device.
   abort_update_if_cmd_failed_long "$POSTINST_RETURN_CODE" "$MOUNTPOINT"/postinst
   # postinstall on new partition succeeded.
 fi
 
-# flush linux caches; seems to be necessary
-sync
-echo 3 > /proc/sys/vm/drop_caches
-# Configure the PMBR to boot the new image.
-# TODO: ChromeOS EFI BIOS will need a different command to set the GPT
-# partition attributes bits to mark the new image as bootable.
-# NOTE: This won't work for ARM, because we'll need to regenerate the U-Boot
-# script when the kernel size and location are changed. Luckily it won't
-# matter because we'll ship with the GPT-based selection process. The U-Boot
-# script is just a temporary hack for bringup.
-# FIX: The current gpt tool requires a -b arg to specify the PMBR bootcode. We
-# don't want to change the code, so we have to extract it, then put it back.
-# We'll fix this RSN.
-dd if=${ROOT_DEV} bs=512 count=1 of=/tmp/oldpmbr.bin
-gpt -S boot -i $NEW_PART_NUM -b /tmp/oldpmbr.bin ${ROOT_DEV} 2>&1 | \
-  cat >> "$MEMENTO_AU_LOG"
-abort_update_if_cmd_failed
-
 if [ -z "${FLAGS_dst_partition}" ]; then
   # mark update as complete so we don't try to update again
   touch "$UPDATED_COMPLETED_FILE"
 fi
 
+# Flush linux caches; seems to be necessary
+sync
+echo 3 > /proc/sys/vm/drop_caches
+
 # tell user to reboot
 log Autoupdate applied. You should now reboot
 echo UPDATED