X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.8;h=e133b7e63f3d93d49ca749c1a8d6c617e40a5dd2;hp=927549bf6074284bcccb697cf59d967a2a5f3d67;hb=fdcd1f4666a4cceb0de7935a72567f30f1905c08;hpb=9eaa50d0e7d7ec15f89ecd667ddbb2935cf78593

diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index 927549bf6..e133b7e63 100644
--- a/extras/scsi_id/scsi_id.8
+++ b/extras/scsi_id/scsi_id.8
@@ -17,7 +17,7 @@ with a non\-zero value.
 \fBscsi_id\fP is primarily for use by other utilities such as \fBudev\fP
 that require a unique SCSI identifier.
 
-By default all devices are assume black listed, the \fB\-\-whitelisted\fP option must
+By default all devices are assumed black listed, the \fB\-\-whitelisted\fP option must
 be specified on the command line or in the config file for any useful
 behaviour.
 
@@ -33,7 +33,7 @@ by page 0x80. For example:
 
 .sp
 .nf
-# scsi_id --page=0x80 --devpath=/block/sdg
+# /lib/udev/scsi_id \-\-page=0x80 \-\-whitelisted \-\-device=/dev/sda
 SIBM     3542           1T05078453
 .fi
 .P
@@ -45,32 +45,19 @@ identifier starts with the NAA value of 6):
 
 .sp
 .nf
-# /sbin/scsi_id --page=0x83 --devpath=/block/sdg
+# /lib/udev/scsi_id \-\-page=0x83 \-\-whitelisted \-\-device=/dev/sda
 3600a0b80000b174b000000d63efc5c8c
 .fi
 .P
 
 .SH OPTIONS
 .TP
-.BI \-\-fallback-to-sysfs
-Always print information (model, vendor strings) about the device even
-if it does not support VPD pages.
-.TP
-.BI \-\-ignore-sysfs
-Ignore sysfs entries. Used for devices which are not represented as SCSI
-devices, but understand SG_IO commands.
-.TP
 .BI \-\-blacklisted
 The default behaviour \- treat the device as black listed, and do nothing
 unless a white listed device is found in the scsi_id config\-file.
 .TP
 .BI \-\-device=\| device\^
-Instead
-of determining and creating a device node based on a sysfs dev
-entry as done for the \fB\-s\fP, send SG_IO commands to 
-\fBdevice\fP, such as \fB/dev/sdc\fP.
-This argument should also be used when invoked via udev to avoid problems
-with creation of temporary files on not-yet writable directories.
+Send SG_IO commands to \fBdevice\fP, such as \fB/dev/sdc\fP.
 .TP
 .BI \-\-config=\| config\-file
 Read configuration and black/white list entries from
@@ -85,10 +72,6 @@ on the command line or in the scsi_id configuration file for
 .B scsi_id
 to generate any output.
 .TP
-.BI \-\-prefix-bus-id
-Prefix the identification string with the  driver model (sysfs) bus id of
-the SCSI device.
-.TP
 .BI \-\-page=\| 0x80 | 0x83 | pre-spc3-83
 Use SCSI INQUIRY VPD page code 0x80, 0x83, or pre-spc3-83.
 .sp
@@ -102,11 +85,6 @@ option is used for older model 4, 5, and 6 EMC Symmetrix devices, its
 use with SPC-2 or SPC-3 compliant devices will fallback to the page 83
 format supported by these devices.
 .TP
-.BI \-\-devpath=\| sysfs\-devpath
-Generate an id for the
-.B sysfs\-devpath.
-The sysfs mount point must not be included.
-.TP
 .BI \-\-replace-whitespace
 Reformat the output : replace all whitespaces by underscores.
 .TP
@@ -120,18 +98,14 @@ Generate verbose debugging output.
 Display version number and exit.
 .RE
 
-.SH ENVIRONMENT
-
-If the DEVPATH environment variable is set, scsi_id assumes it has been
-invoked via udev (or some other hotplug program), and all errors or
-warnings are sent using syslog.
-.P
-
 .SH "FILES"
 .nf
 .ft B
 .ft
-/etc/scsi_id.config                  configuration and black/white list entries
+.TP
+\fI/etc/scsi_id.config\fP
+configuration and black/white list entries
+.RE
 .fi
 .LP
 .SH "SEE ALSO"