diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2017-09-03 13:51:25 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2017-09-03 13:51:25 -0400 |
| commit | ac4be6d36e91a7312be1a482ef6b1e089daa5bf2 (patch) | |
| tree | 80a9b6dca8b512a27cc74e9cd1d6eeebc8ac4ff1 | |
| parent | Merge pull request #149 from msmith626/symlink_spaces_fix (diff) | |
| download | eudev-ac4be6d36e91a7312be1a482ef6b1e089daa5bf2.tar.gz eudev-ac4be6d36e91a7312be1a482ef6b1e089daa5bf2.tar.bz2 eudev-ac4be6d36e91a7312be1a482ef6b1e089daa5bf2.zip | |
src/ata_id/ata_id.c: fix names under /dev/disk/by-id/, gentoo bug #616628
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | src/ata_id/ata_id.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/ata_id/ata_id.c b/src/ata_id/ata_id.c index 0f53fa010..ff78be6c4 100644 --- a/src/ata_id/ata_id.c +++ b/src/ata_id/ata_id.c @@ -481,7 +481,7 @@ int main(int argc, char *argv[]) disk_identify_fixup_string(identify.byte, 27, 40); /* model */ disk_identify_fixup_uint16(identify.byte, 0); /* configuration */ disk_identify_fixup_uint16(identify.byte, 75); /* queue depth */ - disk_identify_fixup_uint16(identify.byte, 75); /* SATA capabilities */ + disk_identify_fixup_uint16(identify.byte, 76); /* SATA capabilities */ disk_identify_fixup_uint16(identify.byte, 82); /* command set supported */ disk_identify_fixup_uint16(identify.byte, 83); /* command set supported */ disk_identify_fixup_uint16(identify.byte, 84); /* command set supported */ @@ -492,6 +492,10 @@ int main(int argc, char *argv[]) disk_identify_fixup_uint16(identify.byte, 90); /* time required for enhanced SECURITY ERASE UNIT */ disk_identify_fixup_uint16(identify.byte, 91); /* current APM values */ disk_identify_fixup_uint16(identify.byte, 94); /* current AAM value */ + disk_identify_fixup_uint16(identify.byte, 108); /* WWN */ + disk_identify_fixup_uint16(identify.byte, 109); /* WWN */ + disk_identify_fixup_uint16(identify.byte, 110); /* WWN */ + disk_identify_fixup_uint16(identify.byte, 111); /* WWN */ disk_identify_fixup_uint16(identify.byte, 128); /* device lock function */ disk_identify_fixup_uint16(identify.byte, 217); /* nominal media rotation rate */ memcpy(&id, identify.byte, sizeof id); @@ -645,10 +649,20 @@ int main(int argc, char *argv[]) * All other values are reserved. */ word = identify.wyde[108]; - if ((word & 0xf000) == 0x5000) - printf("ID_WWN=0x%1$"PRIu64"x\n" - "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n", - identify.octa[108/4]); + if ((word & 0xf000) == 0x5000) { + uint64_t wwwn; + + wwwn = identify.wyde[108]; + wwwn <<= 16; + wwwn |= identify.wyde[109]; + wwwn <<= 16; + wwwn |= identify.wyde[110]; + wwwn <<= 16; + wwwn |= identify.wyde[111]; + printf("ID_WWN=0x%1$" PRIx64 "\n" + "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n", + wwwn); + } /* from Linux's include/linux/ata.h */ if (identify.wyde[0] == 0x848a || |