From 84de085a514eaa2eaeb84f9ee95ae3d4dcdba2cb Mon Sep 17 00:00:00 2001
From: radu <none@none>
Date: Wed, 8 Mar 2006 18:37:02 +0000
Subject: [PATCH] 2006-03-08 18:37:01 by radu Moved Xen configuration file
 creation in a hook

---
 etc/hook.d/95-create-cfg | 34 ++++++++++++++++++++++++++++++++++
 xen-create-image         | 39 ++++-----------------------------------
 2 files changed, 38 insertions(+), 35 deletions(-)
 create mode 100755 etc/hook.d/95-create-cfg

diff --git a/etc/hook.d/95-create-cfg b/etc/hook.d/95-create-cfg
new file mode 100755
index 0000000..382392e
--- /dev/null
+++ b/etc/hook.d/95-create-cfg
@@ -0,0 +1,34 @@
+#!/bin/sh -x
+#
+#  This script is responsible for setting up the Xen Configuration file
+
+#prefix=$1
+
+kernel="kern"
+memory=512
+hostname="aiurea"
+
+#
+# Make sure we use ide style device names if required
+#
+device=sda
+if [ "${use-ide}" ]; then
+    device=hda
+fi
+
+if [ "${dhcp}" ]; then
+	dyn='dhcp = "dhcp"'
+fi
+
+echo "Creating Xen configuration file in /etc/xen .. "
+
+cat <<E_O_CFG > /etc/xen/${hostname}.cfg
+kernel = '${kernel}'
+memory = ${memory}
+name   = '${hostname}'
+root   = '/dev/${device}1 ro'
+vif    = ['']
+disk   = [ '$image_vbd,${device}1,w', '$swap_vbd,${device}2,w' ]
+${dyn}
+
+E_O_CFG
diff --git a/xen-create-image b/xen-create-image
index 5461b32..b368146 100755
--- a/xen-create-image
+++ b/xen-create-image
@@ -402,7 +402,7 @@ Install an X11 server, using VNC and XDM
  --
  http://www.steve.org.uk/
 
- $Id: xen-create-image,v 1.101 2006-02-22 19:24:40 steve Exp $
+ $Id: xen-create-image,v 1.102 2006-03-08 18:37:01 radu Exp $
 
 =cut
 
@@ -822,39 +822,6 @@ if ( $CONFIG{'passwd'} )
 #
 runCommand( "umount $dir" );
 
-#
-# Finally setup Xen to allow us to create the image.
-#
-
-#
-# Make sure we use ide style device names if required
-#
-my $device = "sda";
-
-if ( $CONFIG{'ide'} )
-{
-    $device = "hda";
-}
-
-print "\n\nCreating Xen configuration file in /etc/xen .. ";
-open( XEN, ">", "/etc/xen/$CONFIG{'hostname'}.cfg" );
-print XEN<<E_O_XEN;
-kernel = "$CONFIG{'kernel'}"
-memory = $CONFIG{'memory'}
-name   = "$CONFIG{'hostname'}"
-root   = "/dev/${device}1 ro"
-vif    = ['']
-disk   = [ '$image_vbd,${device}1,w', '$swap_vbd,${device}2,w' ]
-E_O_XEN
-if ( $CONFIG{'dhcp'} )
-{
-    print XEN "dhcp=\"dhcp\"\n";
-}
-close( XEN );
-print "Done\n";
-
-
-
 #
 #  Clear screen before printing success message, unless
 # we're running under '--debug'.
@@ -1038,7 +1005,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-	my $REVISION      = '$Revision: 1.101 $';
+	my $REVISION      = '$Revision: 1.102 $';
 
 	if ( $REVISION =~ /1.([0-9.]+) / )
 	{
@@ -1489,6 +1456,8 @@ sub runHooks
 	}
     }
 
+    $ENV{'image_vdb'} = $image_vbd;
+    $ENV{'swap_vdb'}  = $swap_vbd;
 
     #
     # Make sure that our scripts run in sorted order, as