scsi_id: delete no longer needed config file

diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 2ae49e3c54bcc69c41f78587a4ee03d61535f873..641a340ddb0d98a21ed207fe783663a72c4a643f 100644 (file)
--- 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 e133b7e63f3d93d49ca749c1a8d6c617e40a5dd2..0221b9883114facda0ed8b6cff4639ac5833d040 100644 (file)
--- 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