init-install.sh: improve hard drive searching process

Previously, only unremovable hard drives are searched and are treated
as candidates of target disks to intall into.

However, it's possible that we're going to install the live image into
a removable media such as an USB. This patch enables this possibility.

In addition, this patch presents more information about the hard drives
so that user may have more knowledge about which hard drive they are
going to install their image into.

[YOCTO #5018]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index d2a0db3183c21fbe2f4d4ef6f554d6410a968517..c8920751454c3f720beba20284cfc27f9d595ce1 100644 (file)
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -13,46 +13,66 @@ boot_size=20
 # 5% for the swap
 swap_ratio=5
 
-found="no"
-
-echo "Searching for a hard drive..."
-for device in 'hda' 'hdb' 'sda' 'sdb' 'mmcblk0' 'mmcblk1'
-  do
-  if [ -e /sys/block/${device}/removable ]; then
-      if [ "$(cat /sys/block/${device}/removable)" = "0" ]; then
-         found="yes"
-
-         while true; do
-             # Try sleeping here to avoid getting kernel messages
-              # obscuring/confusing user
-             sleep 5
-             echo "Found drive at /dev/${device}. Do you want to install this image there ? [y/n]"
-             read answer
-             if [ "$answer" = "y" ] ; then
-                 break
-             fi
-         
-             if [ "$answer" = "n" ] ; then
-                 found=no
-                 break
-             fi
-
-             echo "Please answer by y or n"
-         done
-      fi
-  fi
-
-  if [ "$found" = "yes" ]; then
-      break;
-  fi
+# Get a list of hard drives
+hdnamelist=""
+live_dev_name=${1%%/*}
+
+echo "Searching for hard drives ..."
+
+for device in `ls /sys/block/`; do
+    case $device in
+       loop*)
+            # skip loop device
+           ;;
+       ram*)
+            # skip ram device
+           ;;
+       *)
+           # skip the device LiveOS is on
+           # Add valid hard drive name to the list
+           if [ $device != $live_dev_name -a -e /dev/$device ]; then
+               hdnamelist="$hdnamelist $device"
+           fi
+           ;;
+    esac
+done
 
+TARGET_DEVICE_NAME=""
+for hdname in $hdnamelist; do
+    # Display found hard drives and their basic info
+    echo "-------------------------------"
+    echo /dev/$hdname
+    if [ -r /sys/block/$hdname/device/vendor ]; then
+       echo -n "VENDOR="
+       cat /sys/block/$hdname/device/vendor
+    fi
+    echo -n "MODEL="
+    cat /sys/block/$hdname/device/model
+    cat /sys/block/$hdname/device/uevent
+    echo
+    # Get user choice
+    while true; do
+       echo -n "Do you want to install this image there? [y/n] "
+       read answer
+       if [ "$answer" = "y" -o "$answer" = "n" ]; then
+           break
+       fi
+       echo "Please answer y or n"
+    done
+    if [ "$answer" = "y" ]; then
+       TARGET_DEVICE_NAME=$hdname
+       break
+    fi
 done
 
-if [ "$found" = "no" ]; then
-      exit 1      
+if [ -n "$TARGET_DEVICE_NAME" ]; then
+    echo "Installing image on /dev/$TARGET_DEVICE_NAME ..."
+else
+    echo "No hard drive selected. Installation aborted."
+    exit 1
 fi
 
-echo "Installing image on /dev/${device}"
+device=$TARGET_DEVICE_NAME
 
 #
 # The udev automounter can cause pain here, kill it
@@ -65,14 +85,6 @@ rm -f /etc/udev/scripts/mount*
 #
 umount /dev/${device}* 2> /dev/null || /bin/true
 
-if [ ! -b /dev/sda ] ; then
-    mknod /dev/sda b 8 0
-fi
-
-if [ ! -b /dev/sdb ] ; then
-    mknod /dev/sdb b 8 16
-fi
-
 if [ ! -b /dev/loop0 ] ; then
     mknod /dev/loop0 b 7 0
 fi