Index: bin/xt-create-xen-config
===================================================================
RCS file: /home/cvs/xen-tools/bin/xt-create-xen-config,v
retrieving revision 1.29
diff -u -r1.29 xt-create-xen-config
--- bin/xt-create-xen-config	26 Dec 2006 00:55:58 -0000	1.29
+++ bin/xt-create-xen-config	6 Feb 2007 19:53:25 -0000
@@ -344,6 +344,12 @@
 
 
     #
+    # The xen-tools version.
+    #
+    $ENV{'xen_tools_version'} = $RELEASE;
+
+
+    #
     #  Now we should have a suitable environment.  What we want to
     # do now is to make sure that these environmental variables are
     # made available to our template file.
Index: etc/xm.tmpl
===================================================================
RCS file: /home/cvs/xen-tools/etc/xm.tmpl,v
retrieving revision 1.10
diff -u -r1.10 xm.tmpl
--- etc/xm.tmpl	5 Dec 2006 15:04:32 -0000	1.10
+++ etc/xm.tmpl	6 Feb 2007 19:53:25 -0000
@@ -1,53 +1,48 @@
 #
-#  Configuration file for the Xen instance {$hostname}, created on
-# { scalar localtime }.
+# Configuration file for the Xen instance {$hostname}, created
+# by xen-tools {$xen_tools_version} on { scalar localtime }.
 #
 
-
 #
 #  Kernel + memory size
 #
 { if ( $kernel )
   {
-    $OUT.= "kernel = '$kernel'\n";
+    $OUT.= "kernel      = '$kernel'";
   }
 }
-
 { if ( $initrd )
   {
-    $OUT.= "ramdisk = '$initrd'\n";
+    $OUT.= "ramdisk     = '$initrd'";
   }
 }
-memory  = '{$memory}'
-
+memory      = '{$memory}'
 
 #
 #  Disk device(s).
 #
-root    = '/dev/{$device}1 ro'
-
+root        = '/dev/{$device}1 ro'
 { if ( $noswap ) 
   {
-        $OUT .= "disk    = [ '$image_vbd,$device" . "1,w' ]";
+        $OUT .= "disk        = [ '$image_vbd,$device" . "1,w' ]";
   }
   else
   {
-        $OUT .= "disk    = [ '$image_vbd,$device" . "1,w', '$swap_vbd,$device" . "2,w' ]";
+        $OUT .= "disk        = [ '$image_vbd,$device" . "1,w', '$swap_vbd,$device" . "2,w' ]";
   }
 }
 
 #
 #  Hostname
 #
-name    = '{$hostname}'
-
+name        = '{$hostname}'
 
 #
 #  Networking
 #
 { if ( $dhcp )
   {
-    $OUT .= "dhcp = 'dhcp'\n";
+    $OUT .= "dhcp        = 'dhcp'\n";
 
     # Setup the mac address, if present.
     my $m = '';
@@ -56,7 +51,7 @@
       $m = "mac=$mac"
     }
 
-    $OUT .= "vif  = [ '$m' ]";
+    $OUT .= "vif         = [ '$m' ]";
   }    
   else
   {
@@ -69,7 +64,7 @@
       $m = ",mac=$mac"
     }
 
-    $OUT .= "vif  = [ 'ip=$ip1"; 
+    $OUT .= "vif         = [ 'ip=$ip1"; 
     $OUT .= "$m' ]";
   }
 }
@@ -80,3 +75,4 @@
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
 on_crash    = 'restart'
+