projects / packages / dmidecode.git / blame
| Commit | Line | Data |
|---|---|---|
| 352666c6 AM |
1 | From 33b5aafc6ee6b5de9f2526fb1cf4b14d1e16e4f0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Franz <roy.franz@linaro.org> | |
| 3 | Date: Thu, 01 Oct 2015 06:41:43 +0000 | |
| 4 | Subject: Add "--no-sysfs" option description to -h output | |
| 5 | ||
| 6 | A description of --no-sysfs was not added to the output of "-h" when | |
| 7 | the feature was added, so add it now. | |
| 8 | --- | |
| 9 | diff --git a/dmiopt.c b/dmiopt.c | |
| 10 | index 0d142d2..de607f4 100644 | |
| 11 | --- a/dmiopt.c | |
| 12 | +++ b/dmiopt.c | |
| 13 | @@ -314,6 +314,7 @@ void print_help(void) | |
| 14 | " -u, --dump Do not decode the entries\n" | |
| 15 | " --dump-bin FILE Dump the DMI data to a binary file\n" | |
| 16 | " --from-dump FILE Read the DMI data from a binary file\n" | |
| 17 | + " --no-sysfs Do not attempt to read DMI data from sysfs files\n" | |
| 18 | " -V, --version Display the version and exit\n"; | |
| 19 | ||
| 20 | printf("%s", help); | |
| 21 | -- | |
| 22 | cgit v0.9.0.2 | |
| 23 | From bf7bad24ce141dab5b5acc3ffb98ce5fe4a8e0f9 Mon Sep 17 00:00:00 2001 | |
| 24 | From: Xie XiuQi <xiexiuqi@huawei.com> | |
| 25 | Date: Wed, 21 Oct 2015 13:12:50 +0000 | |
| 26 | Subject: Fix 'No SMBIOS nor DMI entry point found' on SMBIOS3 | |
| 27 | ||
| 28 | address_from_efi may return a SMBIOS or SMBIOS3 format entry | |
| 29 | point, so add this condition. | |
| 30 | --- | |
| 31 | diff --git a/AUTHORS b/AUTHORS | |
| 32 | index d4badfa..ccf7fbb 100644 | |
| 33 | --- a/AUTHORS | |
| 34 | +++ b/AUTHORS | |
| 35 | @@ -19,6 +19,7 @@ Jarod Wilson <jarod@redhat.com> | |
| 36 | Anton Arapov <anton@redhat.com> | |
| 37 | Roy Franz <roy.franz@linaro.org> | |
| 38 | Tyler Bell <tyler.bell@hp.com> | |
| 39 | +Xie XiuQi <xiexiuqi@huawei.com> | |
| 40 | ||
| 41 | MANY THANKS TO (IN CHRONOLOGICAL ORDER) | |
| 42 | Werner Heuser | |
| 43 | diff --git a/dmidecode.c b/dmidecode.c | |
| 44 | index ce0511b..cfcade4 100644 | |
| 45 | --- a/dmidecode.c | |
| 46 | +++ b/dmidecode.c | |
| 47 | @@ -4866,8 +4866,16 @@ int main(int argc, char * const argv[]) | |
| 48 | goto exit_free; | |
| 49 | } | |
| 50 | ||
| 51 | - if (smbios_decode(buf, opt.devmem, 0)) | |
| 52 | - found++; | |
| 53 | + if (memcmp(buf, "_SM3_", 5) == 0) | |
| 54 | + { | |
| 55 | + if (smbios3_decode(buf, opt.devmem, 0)) | |
| 56 | + found++; | |
| 57 | + } | |
| 58 | + else if (memcmp(buf, "_SM_", 4) == 0) | |
| 59 | + { | |
| 60 | + if (smbios_decode(buf, opt.devmem, 0)) | |
| 61 | + found++; | |
| 62 | + } | |
| 63 | goto done; | |
| 64 | ||
| 65 | memory_scan: | |
| 66 | -- | |
| 67 | cgit v0.9.0.2 |