diff options
| author | David Zeuthen <davidz@redhat.com> | 2011-10-28 11:29:32 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2011-10-28 11:29:32 -0400 |
| commit | 1115f43d3a930fcfa7057de3b0f50e3845baa293 (patch) | |
| tree | 6afba6e1346c81dc20694a8b3080edec0756ff6b /src/udiskslinuxdrive.c | |
| parent | 6d694b753b4c917a52abcd40677d55bc60ce63f7 (diff) | |
For serial numbers, only use ID_SERIAL_SHORT, never ID_SERIAL
In the case that no real serial number exists, ID_SERIAL is made up
from vendor/model e.g. ST360021_A-0:0 or MediaTek_DVD-ROM_1309. We
don't want to convey such lies.
On the other hand, we should be guaranteed if ID_SERIAL_SHORT is set,
then it is something we can actually trust to be somewhat unique.
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'src/udiskslinuxdrive.c')
| -rw-r--r-- | src/udiskslinuxdrive.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/udiskslinuxdrive.c b/src/udiskslinuxdrive.c index 3534c33..602461d 100644 --- a/src/udiskslinuxdrive.c +++ b/src/udiskslinuxdrive.c @@ -342,7 +342,6 @@ udisks_linux_drive_update (UDisksLinuxDrive *drive, if (g_udev_device_get_property_as_boolean (device, "ID_ATA")) { const gchar *model; - const gchar *serial; model = g_udev_device_get_property (device, "ID_MODEL_ENC"); if (model != NULL) @@ -356,10 +355,7 @@ udisks_linux_drive_update (UDisksLinuxDrive *drive, udisks_drive_set_vendor (iface, g_udev_device_get_property (device, "")); udisks_drive_set_revision (iface, g_udev_device_get_property (device, "ID_REVISION")); - serial = g_udev_device_get_property (device, "ID_SERIAL_SHORT"); - if (serial == NULL) - serial = g_udev_device_get_property (device, "ID_SERIAL"); - udisks_drive_set_serial (iface, serial); + udisks_drive_set_serial (iface, g_udev_device_get_property (device, "ID_SERIAL_SHORT")); udisks_drive_set_wwn (iface, g_udev_device_get_property (device, "ID_WWN_WITH_EXTENSION")); } else if (g_udev_device_get_property_as_boolean (device, "ID_SCSI")) @@ -468,10 +464,7 @@ udisks_linux_drive_update (UDisksLinuxDrive *drive, } udisks_drive_set_revision (iface, g_udev_device_get_property (device, "ID_REVISION")); - if (g_udev_device_has_property (device, "ID_SERIAL_SHORT")) - udisks_drive_set_serial (iface, g_udev_device_get_property (device, "ID_SERIAL_SHORT")); - else - udisks_drive_set_serial (iface, g_udev_device_get_property (device, "ID_SERIAL")); + udisks_drive_set_serial (iface, g_udev_device_get_property (device, "ID_SERIAL_SHORT")); if (g_udev_device_has_property (device, "ID_WWN_WITH_EXTENSION")) udisks_drive_set_wwn (iface, g_udev_device_get_property (device, "ID_WWN_WITH_EXTENSION")); else |