From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3606-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 3189 invoked by alias); 26 Oct 2010 01:25:48 -0000
Received: (qmail 3171 invoked by uid 9805); 26 Oct 2010 01:25:47 -0000
Date: Tue, 26 Oct 2010 01:25:00 -0000
Message-ID: <20101026012547.3169.qmail@sourceware.org>
From: snitzer@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/test test-utils.sh
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-10/txt/msg00089.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	snitzer@sourceware.org	2010-10-26 01:25:47

Modified files:
	test           : test-utils.sh 

Log message:
	Explicitly have grep print the matching filenames (needed to
	successfully determine scsi_debug device).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/test-utils.sh.diff?cvsroot=lvm2&r1=1.53&r2=1.54

--- LVM2/test/test-utils.sh	2010/10/20 15:14:13	1.53
+++ LVM2/test/test-utils.sh	2010/10/26 01:25:46	1.54
@@ -245,7 +245,7 @@
     modprobe scsi_debug dev_size_mb=$DEV_SIZE $SCSI_DEBUG_PARAMS num_tgts=1 || exit 200
     sleep 2 # allow for async Linux SCSI device registration
 
-    local DEBUG_DEV=/dev/$(grep scsi_debug /sys/block/*/device/model | cut -f4 -d /)
+    local DEBUG_DEV=/dev/$(grep -H scsi_debug /sys/block/*/device/model | cut -f4 -d /)
     [ -b $DEBUG_DEV ] || exit 1 # should not happen
 
     # Create symlink to scsi_debug device in $DM_DEV_DIR