aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/diskinfo
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2017-07-06 09:05:38 +0000
committerAlexander Motin <mav@FreeBSD.org>2017-07-06 09:05:38 +0000
commit321728cef15990b0e0ac005c085b973200d9ae0a (patch)
treebc879509ef930f35981abf31afd798544324d958 /usr.sbin/diskinfo
parent163169067710746052179911fec24dfb82aeb2c2 (diff)
downloadsrc-321728cef15990b0e0ac005c085b973200d9ae0a.tar.gz
src-321728cef15990b0e0ac005c085b973200d9ae0a.zip
Report device descr in addition to ident.
Serial number without device model is somewhat less useful. MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=320730
Diffstat (limited to 'usr.sbin/diskinfo')
-rw-r--r--usr.sbin/diskinfo/diskinfo.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index dd119388b675..e6ae46f8c3f0 100644
--- a/usr.sbin/diskinfo/diskinfo.c
+++ b/usr.sbin/diskinfo/diskinfo.c
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <errno.h>
@@ -73,6 +74,7 @@ main(int argc, char **argv)
int i, ch, fd, error, exitval = 0;
char buf[BUFSIZ], ident[DISK_IDENT_SIZE], physpath[MAXPATHLEN];
char zone_desc[64];
+ struct diocgattr_arg arg;
off_t mediasize, stripesize, stripeoffset;
u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg;
uint32_t zone_mode;
@@ -230,6 +232,10 @@ main(int argc, char **argv)
printf("\t%-12u\t# Heads according to firmware.\n", fwheads);
printf("\t%-12u\t# Sectors according to firmware.\n", fwsectors);
}
+ strlcpy(arg.name, "GEOM::descr", sizeof(arg.name));
+ arg.len = sizeof(arg.value.str);
+ if (ioctl(fd, DIOCGATTR, &arg) == 0)
+ printf("\t%-12s\t# Disk descr.\n", arg.value.str);
if (ioctl(fd, DIOCGIDENT, ident) == 0)
printf("\t%-12s\t# Disk ident.\n", ident);
if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0)