]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lsblk: Add --scsi switch
authorMilan Broz <mbroz@redhat.com>
Fri, 2 Nov 2012 17:56:31 +0000 (18:56 +0100)
committerKarel Zak <kzak@redhat.com>
Wed, 7 Nov 2012 12:20:45 +0000 (13:20 +0100)
The --scsi switch prints similar information to lsscsi command.

Signed-off-by: Milan Broz <mbroz@redhat.com>
misc-utils/lsblk.8
misc-utils/lsblk.c

index ced0a130ca180563b7bcf7176b445478fbb84a34..c280ed474c00bdc5df7be7c4bcbbfa440abca048 100644 (file)
@@ -74,6 +74,8 @@ Use the raw output format. All potentially unsafe characters are hex-escaped
 Print dependencies in inverse order.
 .IP "\fB\-t, \-\-topology\fP"
 Output info about block device topology.
+.IP "\fB\-S, \-\-scsi\fP"
+Output info about SCSI devices.
 This option is equivalent to "-o NAME,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,RQ-SIZE".
 .IP "\fB\-V, \-\-version\fP"
 Output version information and exit.
index f8bc6eaa9de662e567f000df25e72436323dff7a..bca44492e262f6796ad6803eb2cedd401832b3f7 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * lsblk(8) - list block devices
  *
- * Copyright (C) 2010,2011 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2010,2011,2012 Red Hat, Inc. All rights reserved.
  * Written by Milan Broz <mbroz@redhat.com>
  *            Karel Zak <kzak@redhat.com>
  *
@@ -162,6 +162,7 @@ struct lsblk {
        unsigned int bytes:1;           /* print SIZE in bytes */
        unsigned int inverse:1;         /* print inverse dependencies */
        unsigned int nodeps:1;          /* don't print slaves/holders */
+       unsigned int scsi:1;            /* print only device with HCTL (SCSI) */
 };
 
 struct lsblk *lsblk;   /* global handler */
@@ -588,7 +589,7 @@ static char *get_transport(struct blkdev_cxt *cxt)
        char *attr = NULL;
        const char *trans = NULL;
 
-       /* SPI - Serial Peripheral Interface */
+       /* SCSI - Serial Peripheral Interface */
        if (sysfs_scsi_host_is(sysfs, "spi"))
                trans = "spi";
 
@@ -976,6 +977,10 @@ static int set_cxt(struct blkdev_cxt *cxt,
        cxt->nholders = sysfs_count_dirents(&cxt->sysfs, "holders");
        cxt->nslaves = sysfs_count_dirents(&cxt->sysfs, "slaves");
 
+       /* ignore non-SCSI devices */
+       if (lsblk->scsi && sysfs_scsi_get_hctl(&cxt->sysfs, NULL, NULL, NULL, NULL))
+               return -1;
+
        return 0;
 }
 
@@ -1330,6 +1335,7 @@ static void __attribute__((__noreturn__)) help(FILE *out)
                " -r, --raw            use raw output format\n"
                " -s, --inverse        inverse dependencies\n"
                " -t, --topology       output info about topology\n"
+               " -S, --scsi           output info about SCSI devices\n"
                " -V, --version        output version information and exit\n"));
 
        fprintf(out, _("\nAvailable columns (for --output):\n"));
@@ -1374,6 +1380,7 @@ int main(int argc, char *argv[])
                { "include",    1, 0, 'I' },
                { "topology",   0, 0, 't' },
                { "pairs",      0, 0, 'P' },
+               { "scsi",       0, 0, 'S' },
                { "version",    0, 0, 'V' },
                { NULL, 0, 0, 0 },
        };
@@ -1394,7 +1401,7 @@ int main(int argc, char *argv[])
        memset(lsblk, 0, sizeof(*lsblk));
 
        while((c = getopt_long(argc, argv,
-                              "abdDe:fhlnmo:PiI:rstV", longopts, NULL)) != -1) {
+                              "abdDe:fhlnmo:PiI:rstVS", longopts, NULL)) != -1) {
 
                err_exclusive_options(c, longopts, excl, excl_st);
 
@@ -1473,6 +1480,16 @@ int main(int argc, char *argv[])
                        columns[ncolumns++] = COL_RQ_SIZE;
                        columns[ncolumns++] = COL_RA;
                        break;
+               case 'S':
+                       lsblk->nodeps = 1;
+                       lsblk->scsi = 1;
+                       columns[ncolumns++] = COL_NAME;
+                       columns[ncolumns++] = COL_HCTL;
+                       columns[ncolumns++] = COL_TYPE;
+                       columns[ncolumns++] = COL_VENDOR;
+                       columns[ncolumns++] = COL_MODEL;
+                       columns[ncolumns++] = COL_REV;
+                       break;
                case 'V':
                        printf(_("%s from %s\n"), program_invocation_short_name,
                                PACKAGE_STRING);