add fallback methods for grabbing disk vendor/model/etc

SVN revision: 59457
This commit is contained in:
Mike Blumenkrantz 2011-05-17 00:10:52 +00:00
parent 495c88aac8
commit 89df67bbc2
1 changed files with 6 additions and 0 deletions

View File

@ -215,8 +215,12 @@ eeze_disk_scan(Eeze_Disk *disk)
if (!disk->cache.vendor)
disk->cache.vendor = udev_device_get_property_value(disk->device, "ID_VENDOR");
if (!disk->cache.vendor)
if (!disk->cache.vendor) disk->cache.vendor = udev_device_get_sysattr_value(disk->device, "vendor");
if (!disk->cache.model)
disk->cache.model = udev_device_get_property_value(disk->device, "ID_MODEL");
if (!disk->cache.model)
if (!disk->cache.model) disk->cache.model = udev_device_get_sysattr_value(disk->device, "model");
if (!disk->cache.serial)
disk->cache.serial = udev_device_get_property_value(disk->device, "ID_SERIAL_SHORT");
if (!disk->cache.uuid)
@ -282,6 +286,7 @@ eeze_disk_vendor_get(Eeze_Disk *disk)
return disk->cache.vendor;
disk->cache.vendor = udev_device_get_property_value(disk->device, "ID_VENDOR");
if (!disk->cache.vendor) disk->cache.vendor = udev_device_get_sysattr_value(disk->device, "vendor");
return disk->cache.vendor;
}
@ -294,6 +299,7 @@ eeze_disk_model_get(Eeze_Disk *disk)
return disk->cache.model;
disk->cache.model = udev_device_get_property_value(disk->device, "ID_MODEL");
if (!disk->cache.model) disk->cache.model = udev_device_get_sysattr_value(disk->device, "model");
return disk->cache.model;
}