[Pkg-escience-soc2009] [SCM] Tool for creating VM images. branch, master, updated. 707d0416696d9025fbfaff4db988eede0dbf65fb

[David Wendt]

The following commit has been merged in the master branch:
commit 707d0416696d9025fbfaff4db988eede0dbf65fb
Author: David Wendt <kmeisthax at Lappy-486.A>
Date:   Tue Jul 7 14:19:10 2009 -0400

    Changed Debian's logging to report the proper selected kernel under Xen
    
    Added (probably wrong) EC2 AKI IDs corresponding to Amazon's linux kernel 2.6.18. AFAIK the documentation did not mention an ARI.

diff --git a/VMBuilder/plugins/debian/distro.py b/VMBuilder/plugins/debian/distro.py
index a2d28cb..3b934f8 100644
--- a/VMBuilder/plugins/debian/distro.py
+++ b/VMBuilder/plugins/debian/distro.py
@@ -126,7 +126,7 @@ class Debian(Distro):
                 self.vm.components = self.vm.components.split(',')
 
         if self.vm.hypervisor.name == 'Xen':
-            logging.info('Xen kernel default: linux-image-%s %s', self.suite.xen_kernel_flavour, self.xen_kernel_version())
+            logging.info('Xen kernel default: linux-image-2.6-%s-%s', self.suite.xen_kernel_flavour, self.vm.arch)
 
         self.vm.virtio_net = self.use_virtio_net()
 
diff --git a/VMBuilder/plugins/debian/etch.py b/VMBuilder/plugins/debian/etch.py
index 3f67b90..03faa60 100644
--- a/VMBuilder/plugins/debian/etch.py
+++ b/VMBuilder/plugins/debian/etch.py
@@ -45,6 +45,8 @@ class Etch(suite.Suite):
     xen_kernel_flavour = 'xen'
     virtio_net = False
 
+    ec2_kernel_info = { 'i386' : 'aki-9b00e5f2', 'amd64' : 'aki-9800e5f1' }
+
     def check_kernel_flavour(self, arch, flavour):
         return flavour in self.valid_flavours[arch]
 

-- 
Tool for creating VM images.