[Ovirt-devel] [PATCH node] Handle installs to usb devices with FS on root device

[Mike Burns]

The check for valid devices looked to see if a filesystem was
installed on the device chosen. It was intended to check for
whether the device was a partition or not.  Using DEVTYPE
solves this.

rhbz#698158

Signed-off-by: Mike Burns <mburns at redhat.com>
---
 scripts/ovirt-boot-functions |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ovirt-boot-functions b/scripts/ovirt-boot-functions
index 9710eb2..4c037be 100644
--- a/scripts/ovirt-boot-functions
+++ b/scripts/ovirt-boot-functions
@@ -57,10 +57,10 @@ find_disk() {
     # /dev/disk/by-id/{ata,cciss,scsi,usb}* correctly,
     # so manually enumerate them
     for d in $(ls /dev/disk/by-id/ata* /dev/disk/by-id/cciss* /dev/disk/by-id/scsi* /dev/disk/by-id/usb* 2>/dev/null); do
-        ID_FS_USAGE=
+        DEVTYPE=
         eval $(udev_info $(readlink -f $d) property "--export")
         # ID_FS_USAGE is set for partitions
-        if [ -z "$ID_FS_USAGE" -a "$ID_BUS" = "$bus" ]; then
+        if [ "$DEVTYPE" = "disk" -a "$ID_BUS" = "$bus" ]; then
             if [ -z "$serial" -o "$serial" = "ALL" \
                 -o "$ID_SERIAL" = "$serial" ]; then
                 local dev="$(readlink -e $d)"
-- 
1.7.4.4