From 147ce71ff6596318c906e98d70b7b0cb013943e7 Mon Sep 17 00:00:00 2001
From: steve <none@none>
Date: Wed, 21 Jun 2006 16:59:34 +0000
Subject: [PATCH] 2006-06-21 16:59:34 by steve  When testing ignore the LVM
 setting which might be in the configuration file.

---
 bin/xen-delete-image | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/bin/xen-delete-image b/bin/xen-delete-image
index 08d7b84..50dcc6d 100755
--- a/bin/xen-delete-image
+++ b/bin/xen-delete-image
@@ -99,7 +99,7 @@ Specify the LVM volume group where images were previously saved.
  --
  http://www.steve.org.uk/
 
- $Id: xen-delete-image,v 1.8 2006-06-13 16:57:34 steve Exp $
+ $Id: xen-delete-image,v 1.9 2006-06-21 16:59:34 steve Exp $
 
 =cut
 
@@ -284,7 +284,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-       my $REVISION      = '$Revision: 1.8 $';
+       my $REVISION      = '$Revision: 1.9 $';
 
        if ( $REVISION =~ /1.([0-9.]+) / )
        {
@@ -307,6 +307,14 @@ sub parseCommandLineArguments
 
 sub checkArguments
 {
+    #
+    #  When testing we only care about loopback images, not disk images.
+    #
+    if ( $CONFIG{'test'} )
+    {
+        $CONFIG{'lvm'} = undef;
+    }
+
     #
     #  Make sure we have either a volume, or a root.
     #
@@ -325,6 +333,7 @@ sub checkArguments
        print "Please specify either a directory root, or an LVM volume group\n";
        exit;
     }
+
 }