From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sun, 28 Jun 2009 01:01:31 +0000 (+0200)
Subject: scsi_id: delete no longer needed config file
X-Git-Tag: 174~921
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=84875aa6b3cb6e3a69f42286fe30aad704dc6399

scsi_id: delete no longer needed config file
---

diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 2ae49e3c5..641a340dd 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 e133b7e63..0221b9883 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