Hi,

The patch I sent around to do this yesterday was broken because of a
merge conflict in my tree. Here is the corrected one.

>From bc4e9d9a2afcc0c506f9f60b3f4081a0ec1709b5 Mon Sep 17 00:00:00 2001
From: Richard Sharpe <[EMAIL PROTECTED]>
Date: Thu, 24 Jul 2008 09:48:02 -0700
Subject: [PATCH] Allow help even when there is no config file ...

Signed-off-by: Richard Sharpe <[EMAIL PROTECTED]>

---
 scripts/tgt-admin |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/tgt-admin b/scripts/tgt-admin
index e006096..76fab79 100755
--- a/scripts/tgt-admin
+++ b/scripts/tgt-admin
@@ -36,9 +36,6 @@ EOF
        exit;
 }

-# Parse the config file with Config::General
-my %conf = ParseConfig(-ConfigFile => "$configfile", -UseApacheInclude => 1, -I
ncludeGlob => 1,);
-
 my $param = $ARGV[0];

 my $execute = 0;
@@ -64,6 +61,9 @@ if (($help == 1) || ($param eq undef)) {
        &usage
 }

+# Parse the config file with Config::General
+my %conf = ParseConfig(-ConfigFile => "$configfile", -UseApacheInclude => 1, -I
ncludeGlob => 1,);
+
 # Show all the targets and exit
 if ($show == 1) {
        execute("tgtadm --lld iscsi --op show --mode target");
--
1.5.5.1
_______________________________________________
Stgt-devel mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/stgt-devel

Reply via email to