Print out disk manufacturer and product while asking user to confirm write to disk

src/scripts/image_to_usb.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.
 
 # Script to convert the output of build_image.sh to a usb image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 72 matching lines @@
 
 if [ -z "${FLAGS_to}" ]; then
   echo "You must specify a file or device to write to using --to."
   disks=$(list_usb_disks)
   if [ -n "$disks" ]; then
     echo "Available USB disks:"
     for disk in $disks; do
       echo "  /dev/$disk:"
       echo "    Manufacturer: $(get_disk_info $disk manufacturer)"
       echo "         Product: $(get_disk_info $disk product)"
+      echo "            Size: $(cat /sys/block/$disk/size) kBytes"
     done
   fi
   exit 1
 fi
 
 # Convert args to paths.  Need eval to un-quote the string so that shell
 # chars like ~ are processed; just doing FOO=`readlink -f ${FOO}` won't work.
 FLAGS_from=`eval readlink -f ${FLAGS_from}`
 FLAGS_to=`eval readlink -f ${FLAGS_to}`
 
 # One last check to make sure user is not shooting themselves in the foot
-if [ -b "${FLAGS_to}" ] &&
-  ! list_usb_disks | grep -q '^'${FLAGS_to##*/}'$' &&
-  [ ${FLAGS_force_non_usb} -ne ${FLAGS_TRUE} ]
-then
-  # Safeguard against writing to a real non-USB disk
-  echo "Error: Device ${FLAGS_to} does not appear to be a USB disk!"
-  echo "       To override this safeguard, use the --force_non_usb flag"
-  exit 1
+if [ -b "${FLAGS_to}" ]; then
+  if list_usb_disks | grep -q '^'${FLAGS_to##*/}'$'; then
+    disk_manufacturer=$(get_disk_info ${FLAGS_to##*/} manufacturer)
+    disk_product=$(get_disk_info ${FLAGS_to##*/} product)
+  elif [ ${FLAGS_force_non_usb} -ne ${FLAGS_TRUE} ]; then
+    # Safeguard against writing to a real non-USB disk
+    echo "Error: Device ${FLAGS_to} does not appear to be a USB disk!"
+    echo "       To override this safeguard, use the --force_non_usb flag"
+    exit 1
+  fi
 fi
 
 # Use this image as the source image to copy
 SRC_IMAGE="${FLAGS_from}/${FLAGS_image_name}"
 
 STATEFUL_DIR="${FLAGS_from}/stateful_partition"
 mkdir -p "${STATEFUL_DIR}"
 
 function do_cleanup {
   echo "Cleaning loopback devices: ${STATEFUL_LOOP_DEV}"
@@ skipping 54 matching lines @@
       echo "destination.  This script needs to write to the drive's device "
       echo "node instead (i.e. ${drive} rather than ${FLAGS_to})."
       echo
     fi
   fi
 
   # Make sure this is really what the user wants, before nuking the device
   if [ ${FLAGS_yes} -ne ${FLAGS_TRUE} ]
   then
     sudo fdisk -l "${FLAGS_to}" 2>/dev/null | grep Disk | head -1
+    [ -n "$disk_manufacturer" ] && echo "Manufacturer: $disk_manufacturer"
+    [ -n "$disk_product" ] && echo "Product: $disk_product"
     echo "This will erase all data on this device:"
     read -p "Are you sure (y/N)? " SURE
     SURE="${SURE:0:1}" # Get just the first character
     if [ "${SURE}" != "y" ]
     then
       echo "Ok, better safe than sorry."
       exit 1
     fi
   fi
 
@@ skipping 24 matching lines @@
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdX bs=4M"
   echo "where /dev/sdX is the entire drive."
   if [ ${INSIDE_CHROOT} -eq 1 ]
   then
     example=$(basename "${FLAGS_to}")
     echo "NOTE: Since you are currently inside the chroot, and you'll need to"
     echo "run dd outside the chroot, the path to the USB image will be"
     echo "different (ex: ~/chromeos/trunk/src/build/images/SOME_DIR/$example)."
   fi
 fi