summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-06-28 03:01:31 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-06-28 03:01:31 +0200
commit84875aa6b3cb6e3a69f42286fe30aad704dc6399 (patch)
treef413c9ead0b5825d4146cae272bc2ceacaf58c68 /extras
parent8bbe3ca4277a7bf8411caf091cd001ca48131b63 (diff)
scsi_id: delete no longer needed config file
Diffstat (limited to 'extras')
-rw-r--r--extras/scsi_id/Makefile.am3
-rw-r--r--extras/scsi_id/scsi_id.85
2 files changed, 4 insertions, 4 deletions
diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 2ae49e3c54..641a340ddb 100644
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -14,9 +14,6 @@ scsi_id_SOURCES = \
../../libudev/libudev-list.c \
../../libudev/libudev-util.c
-dist_sysconf_DATA = \
- scsi_id.config
-
dist_man_MANS = \
scsi_id.8
diff --git a/extras/scsi_id/scsi_id.8 b/extras/scsi_id/scsi_id.8
index e133b7e63f..0221b98831 100644
--- a/extras/scsi_id/scsi_id.8
+++ b/extras/scsi_id/scsi_id.8
@@ -104,7 +104,10 @@ Display version number and exit.
.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