unify/cleanup event handling

[elogind.git] / extras / scsi_id / scsi_id.8

diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index 725b7d5317c3d5d17f0bfb75c239b7aa17f26e14..0221b9883114facda0ed8b6cff4639ac5833d040 100644 (file)
--- 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.
 
 \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.
 
 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
 
 .sp
 .nf

-# scsi_id --page=0x80 --devpath=/block/sdg
+# /lib/udev/scsi_id \-\-page=0x80 \-\-whitelisted \-\-device=/dev/sda

 SIBM     3542           1T05078453
 .fi
 .P
 SIBM     3542           1T05078453
 .fi
 .P


@@ -45,7 +45,7 @@ identifier starts with the NAA value of 6):
 
 .sp
 .nf
 
 .sp
 .nf

-# scsi_id --page=0x83 --devpath=/block/sdg
+# /lib/udev/scsi_id \-\-page=0x83 \-\-whitelisted \-\-device=/dev/sda

 3600a0b80000b174b000000d63efc5c8c
 .fi
 .P
 3600a0b80000b174b000000d63efc5c8c
 .fi
 .P


@@ -98,20 +98,16 @@ Generate verbose debugging output.
 Display version number and exit.
 .RE
 
 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
 .TP
 \fI/etc/scsi_id.config\fP
 .SH "FILES"
 .nf
 .ft B
 .ft
 .TP
 \fI/etc/scsi_id.config\fP

-configuration and black/white list entries
+Configuration of black/white list entries and per device options:
+# one config per line, short match strings match longer strings
+# vendor=string[,model=string],options=<per-device scsi_id command line options>
+vendor="ATA",options=-p 0x80

 .RE
 .fi
 .LP
 .RE
 .fi
 .LP