[stgt] [PATCH] tgt-admin: fix parsing information from direct device

[Tomasz Chmielewski]

Doron Shoham schrieb:
> fix parsing information from direct device
> 
> Signed-off-by: Doron Shoham <dorons at voltaire.com>
> ---
>  scripts/tgt-admin |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/tgt-admin b/scripts/tgt-admin
> index 22c4725..3bc5116 100755
> --- a/scripts/tgt-admin
> +++ b/scripts/tgt-admin
> @@ -300,7 +300,7 @@ sub process_options {
>  			# Check if device exists
>  			if ( -e $direct_store) {
>  				$inq=`sg_inq $direct_store`;
> -				if ($inq=~/Vendor identification:\s*(\w+)\s*\n*Product identification:\s*([\w\s\/\-]+)\n\s*\n*Product revision level:\s*(\w*)\s*\n*Unit serial number:\s*(\w+)/)
> +				if ($inq=~/Vendor identification:\s*(\w+)\s*\n*Product identification:\s*([\w\s\/\-]+)\n\s*\n*Product revision level:\s*(\S*)\s*\n*Unit serial number:\s*(\S+)/)
>  				{
>  					$vendor_id="$1";
>  					$prod_id="$2";

Also, right now direct store has currently "lun 1" hardcoded.

However, I'll probably merge direct-store and backing-store parsing when 
I add additional options, like scsi_sn, product_id etc.: for direct 
store, we will read the info from sg_inq, and if there are any other 
options specified in the config(like vendor_id etc.), they would be 
overwritten.

I have direct-store part almost ready; adding direct-store would happen 
in the coming week.


-- 
Tomasz Chmielewski
http://wpkg.org
--
To unsubscribe from this list: send the line "unsubscribe stgt" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html