From f19257a2238c38f23a244a1cc17ec33c07d2b663 Mon Sep 17 00:00:00 2001
From: steve <none@none>
Date: Fri, 9 Jun 2006 18:36:10 +0000
Subject: [PATCH] 2006-06-09 18:36:10 by steve   Remove the hack to rename
 sid/etch/sarge -> debian, to be replaced by symlinks.

---
 bin/xen-create-image | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/bin/xen-create-image b/bin/xen-create-image
index 39926c0..8f716fe 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -31,7 +31,7 @@ xen-create-image - Create a new Xen instance
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.12 2006-06-09 17:28:08 steve Exp $
+ $Id: xen-create-image,v 1.13 2006-06-09 18:36:10 steve Exp $
 
 =cut
 
@@ -389,7 +389,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-	my $REVISION      = '$Revision: 1.12 $';
+	my $REVISION      = '$Revision: 1.13 $';
 
 	if ( $REVISION =~ /1.([0-9.]+) / )
 	{
@@ -444,18 +444,6 @@ sub checkArguments
 	exit 1;
     }
 
-    #
-    #  Cheat and remap distributions names.
-    #
-    # TODO: Alternative create symlinks in the hook.d
-    if ( ( $CONFIG{'dist'} =~ /^sarge$/i ) ||
-	 ( $CONFIG{'dist'} =~ /^etch$/i  ) ||
-	 ( $CONFIG{'dist'} =~ /^sid$/i   ) )
-    {
-	$CONFIG{'dist'} = 'debian';
-    }
-
-
     #
     #
     #  Test that the distribution name we've been given
@@ -777,6 +765,11 @@ sub installSystem
     #
     my $cmd = "/usr/bin/xt-install-image --location=$MOUNT_POINT --dist=$CONFIG{'dist'}";
 
+    #
+    #  Add on the current cache setting
+    #
+    $cmd .= " --cache=$CONFIG{'cache'}" if length( $CONFIG{'cache'} );
+
     #
     #  Installation method
     #