[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, experimental, updated. debian/2.1.1-1_experimental1-51-g95835b7

[Andy Grimm]

The following commit has been merged in the experimental branch:
commit cd1691b766c165d958d78344926e74d6df4851bf
Author: Andy Grimm <agrimm at gmail.com>
Date:   Wed Sep 19 10:31:23 2012 -0400

    Support direct install of Ubuntu cloud images
    
    Fixes TOOLS-142

diff --git a/euca2ools/commands/eustore/installimage.py b/euca2ools/commands/eustore/installimage.py
index b33390c..f18040a 100755
--- a/euca2ools/commands/eustore/installimage.py
+++ b/euca2ools/commands/eustore/installimage.py
@@ -36,6 +36,7 @@ import os
 import sys
 import tarfile
 import hashlib
+import re
 import zlib
 import tempfile
 import urllib2
@@ -268,14 +269,15 @@ class InstallImage(AWSQueryRequest):
                         if not(kernel_dir) and (os.path.dirname(path) != tar_root):
                             continue;
                         if not name.startswith('.'):
-                            if name.startswith('vmlin'):
+                            # Note that vmlinuz is not always at the beginning of the filename
+                            if name.find('vmlinu') != -1:
                                 print "Bundling/uploading kernel"
                                 if prefix:
                                     name = prefix+name
                                 kernel_id = self.bundleFile(path, name, description, arch, 'true', None)
                                 kernel_found = True
                                 print kernel_id
-                            elif name.startswith('initrd'):
+                            elif re.match(".*(initr(d|amfs)|loader).*", name):
                                 print "Bundling/uploading ramdisk"
                                 if prefix:
                                     name = prefix+name

-- 
managing cloud instances for Eucalyptus