From 99f43b721f3dd31dcc8bdb1835c66c5b735aa63f Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Fri, 2 Nov 2012 18:56:30 +0100 Subject: [PATCH] lsblk: Add vendor column Signed-off-by: Milan Broz --- misc-utils/lsblk.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index 671d91295..f8bc6eaa9 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -101,6 +101,7 @@ enum { COL_HCTL, COL_TRANSPORT, COL_REV, + COL_VENDOR, }; /* column names */ @@ -152,6 +153,7 @@ static struct colinfo infos[] = { [COL_HCTL] = { "HCTL", 10, 0, N_("Host:Channel:Target:Lun for SCSI") }, [COL_TRANSPORT] = { "TRAN", 6, 0, N_("device transport type") }, [COL_REV] = { "REV", 4, TT_FL_RIGHT, N_("device revision") }, + [COL_VENDOR] = { "VENDOR", 0.1, TT_FL_TRUNC, N_("device vendor") }, }; struct lsblk { @@ -775,6 +777,13 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line tt_line_set_data(ln, col, p); } break; + case COL_VENDOR: + if (!cxt->partition && cxt->nslaves == 0) { + p = sysfs_strdup(&cxt->sysfs, "device/vendor"); + if (p) + tt_line_set_data(ln, col, p); + } + break; case COL_SIZE: if (cxt->size) { if (lsblk->bytes) {