From 50131b98b68d867e0117ce5fa27aac4dcce714bb Mon Sep 17 00:00:00 2001
From: steve <none@none>
Date: Thu, 16 Feb 2006 19:24:38 +0000
Subject: [PATCH] 2006-02-16 19:24:38 by steve   Setup the volume disks
 correctly in the xen configuration file.

---
 xen-create-image | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/xen-create-image b/xen-create-image
index 59930ca..feb73d8 100755
--- a/xen-create-image
+++ b/xen-create-image
@@ -351,7 +351,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.91 2006-02-16 19:22:21 steve Exp $
+ $Id: xen-create-image,v 1.92 2006-02-16 19:24:38 steve Exp $
 
 =cut
 
@@ -758,18 +758,21 @@ print XEN<<E_O_XEN;
 kernel = "$CONFIG{'kernel'}"
 memory = $CONFIG{'memory'}
 name   = "$CONFIG{'hostname'}"
-disk   = [ 'file:$image,sda1,w','file:$swap,sda2,w' ]
 root   = "/dev/sda1 ro"
 vif    = ['']
 E_O_XEN
+if ( $CONFIG{'dir'} )
+{
+    print XEN "disk   = [ 'file:$image,sda1,w','file:$swap,sda2,w' ]\n";
+}
+if ( $CONFIG{'volume'} )
+{
+    print XEN "disk   = [ 'phy:$CONFIG{'volume'}/$CONFIG{'hostname'}-root{,sda1,w','phy:$CONFIG{'volume'}/$CONFIG{'hostname'}-swap,sda2,w' ]\n";
+}
 if ( $CONFIG{'dhcp'} )
 {
     print XEN "dhcp=\"dhcp\"\n";
 }
-else
-{
-    print XEN "#dhcp=\"dhcp\"\n";
-}
 close( XEN );
 print "Done\n";
 
@@ -957,7 +960,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-	my $REVISION      = '$Revision: 1.91 $';
+	my $REVISION      = '$Revision: 1.92 $';
 
 	if ( $REVISION =~ /1.([0-9.]+) / )
 	{