=== modified file 'euca2ools/image.py'
--- euca2ools/image.py	2011-05-05 02:31:16 +0000
+++ euca2ools/image.py	2011-05-05 16:40:36 +0000
@@ -94,12 +94,13 @@
         tunecmd = [ ]
         if fs_type.startswith("ext"):
             mkfs = [ mkfs_prog , '-F', image_path ]
-            if uuid: mkfs.extend([ '-U', uuid ])
+            if uuid:
+                tunecmd = [ 'tune2fs', '-U', uuid, image_path ]
             if label: mkfs.extend([ '-L', label ])
         elif fs_type == "xfs":
             mkfs = [ mkfs_prog , image_path ]
             if label: mkfs.extend([ '-L', label ])
-            tunecmd = [ 'xfs_admin', '-U', uuid ]
+            tunecmd = [ 'xfs_admin', '-U', uuid, image_path ]
         elif fs_type == "btrfs":
             if uuid: raise(UnsupportedException("btrfs with uuid not supported"))
             if label: mkfs.extend([ '-L', label ])
@@ -113,7 +114,7 @@
 
         makefs_cmd = subprocess.Popen(mkfs,subprocess.PIPE).communicate()[0]
 
-        if len(tunecmd):
+        if len(tunecmd) > 0:
             utils.check_prerequisite_command(tunecmd[0])
             tune_cmd = subprocess.Popen(tunecmd,subprocess.PIPE).communicate()[0]