From 279d8e74daaa24af42579c4ea3d1af53a0305ca8 Mon Sep 17 00:00:00 2001
From: steve <none@none>
Date: Sun, 10 Sep 2006 21:04:20 +0000
Subject: [PATCH] 2006-09-10 21:04:20 by steve   Updated soley to allow tests
 to complete.

---
 bin/xen-create-image | 13 ++++++++++---
 tests/getopt.t       |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bin/xen-create-image b/bin/xen-create-image
index 1df3a8f..e7531ac 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -79,6 +79,9 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                  this is assumed to be a previously installed system.
                  This is much faster than installing from scratch.
 
+   --copy-cmd    This allows you to specify the command actually used for
+                 installation when using "--copy"
+
    --dist        Specify the distribution you wish to install.
 
    --debootstrap Use debootstrap to install the guest system.
@@ -95,6 +98,9 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
                  Similar to --copy this is signficantly faster than
                  installing via rpmstrap or debootstrap.
 
+   --tar-cmd     This allows you to specify the command actually used for
+                 installation when using "--tar".
+
    --template    Specify which template file to use when creating the
                  Xen configuration file.
 
@@ -454,7 +460,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.92 2006-09-10 18:22:42 steve Exp $
+ $Id: xen-create-image,v 1.93 2006-09-10 21:04:20 steve Exp $
 
 =cut
 
@@ -774,7 +780,6 @@ sub setupDefaultOptions
     $CONFIG{'copy'}        = '';
     $CONFIG{'tar'}         = '';
 
-
     #
     #  The program to run to create a filesystem.
     #
@@ -930,9 +935,11 @@ sub parseCommandLineArguments
                #  NOTE:  We set the local variable here, not the global.
                #
                "copy=s",       \$install{'copy'},
+               "copy-cmd=s",   \$CONFIG{'copy-cmd'},   # NOP - IGNORED.
                "debootstrap",  \$install{'debootstrap'},
                "rpmstrap",     \$install{'rpmstrap'},
                "tar=s",        \$install{'tar'},
+               "tar-cmd=s",    \$CONFIG{'tar-cmd'},   # NOP - IGNORED.
 
                # Misc. options
                "accounts",     \$CONFIG{'accounts'},
@@ -961,7 +968,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-        my $REVISION      = '$Revision: 1.92 $';
+        my $REVISION      = '$Revision: 1.93 $';
         if ( $REVISION =~ /1.([0-9.]+) / )
         {
             $REVISION = $1;
diff --git a/tests/getopt.t b/tests/getopt.t
index bf21631..7907ed7 100644
--- a/tests/getopt.t
+++ b/tests/getopt.t
@@ -7,7 +7,7 @@
 #
 # Steve
 # --
-# $Id: getopt.t,v 1.2 2006-06-22 15:01:53 steve Exp $
+# $Id: getopt.t,v 1.3 2006-09-10 21:04:20 steve Exp $
 
 
 use strict;
@@ -136,6 +136,6 @@ sub testFile
     #
     foreach my $argument ( @documented )
     {
-        is( $accepted{$argument}, 1, "Option '--$argument' accepted" );
+        is( $accepted{$argument}, 1, "Option '--$argument' accepted: $file" );
     }
 }