Merge lp:~kees/vmbuilder/use-ext4 into lp:vmbuilder/trunk

[Kees Cook]

[Kees Cook (kees)]

Switches default fs to ext4 for karmic and later.

[lp:~kees/vmbuilder/use-ext4]

360. By Kees Cook on 2010-01-04

add Lucid guest support

=== modified file 'AUTHORS'
--- AUTHORS	2008-09-29 12:28:03 +0000
+++ AUTHORS	2010-01-04 19:54:14 +0000
@@ -2,3 +2,4 @@
 
 Other contributors:
  * Nicolas Barcet <[e-mail]>
+ * Kees Cook <[e-mail]>

=== modified file 'VMBuilder/disk.py'
--- VMBuilder/disk.py	2009-10-23 07:17:47 +0000
+++ VMBuilder/disk.py	2010-01-04 19:54:14 +0000
@@ -32,6 +32,7 @@
 TYPE_EXT3 = 1
 TYPE_XFS = 2
 TYPE_SWAP = 3
+TYPE_EXT4 = 4
 
 class Disk(object):
     def __init__(self, vm, size='5G', preallocated=False, filename=None):
@@ -217,7 +218,7 @@
             @rtype: string
             @return: the filesystem type of the partition suitable for passing to parted
             """
-            return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext2', TYPE_XFS: 'ext2', TYPE_SWAP: 'linux-swap(new)' }[self.type]
+            return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext2', TYPE_EXT4: 'ext2', TYPE_XFS: 'ext2', TYPE_SWAP: 'linux-swap(new)' }[self.type]
 
         def create(self, disk):
             """Adds partition to the disk image (does not mkfs or anything like that)"""
@@ -254,13 +255,7 @@
         self.device = device
         self.dummy = dummy
            
-        try:
-            if int(type) == type:
-                self.type = type
-            else:
-                self.type = str_to_type(type)
-        except ValueError, e:
-            self.type = str_to_type(type)
+        self.set_type(type)
 
         self.mntpnt = mntpnt
 
@@ -299,13 +294,13 @@
     def mkfs_fstype(self):
         if self.vm.suite in ['dapper', 'edgy', 'feisty', 'gutsy']:
             logging.debug('%s: 128 bit inode' % self.vm.suite)
-            return { TYPE_EXT2: ['mkfs.ext2', '-F'], TYPE_EXT3: ['mkfs.ext3', '-I 128', '-F'], TYPE_XFS: ['mkfs.xfs'], TYPE_SWAP: ['mkswap'] }[self.type]
+            return { TYPE_EXT2: ['mkfs.ext2', '-F'], TYPE_EXT3: ['mkfs.ext3', '-I 128', '-F'], TYPE_EXT4: ['mkfs.ext4', '-I 128', '-F'], TYPE_XFS: ['mkfs.xfs'], TYPE_SWAP: ['mkswap'] }[self.type]
         else:
             logging.debug('%s: 256 bit inode' % self.vm.suite)
-            return { TYPE_EXT2: ['mkfs.ext2', '-F'], TYPE_EXT3: ['mkfs.ext3', '-F'], TYPE_XFS: ['mkfs.xfs'], TYPE_SWAP: ['mkswap'] }[self.type]
+            return { TYPE_EXT2: ['mkfs.ext2', '-F'], TYPE_EXT3: ['mkfs.ext3', '-F'], TYPE_EXT4: ['mkfs.ext4', '-F'], TYPE_XFS: ['mkfs.xfs'], TYPE_SWAP: ['mkswap'] }[self.type]
 
     def fstab_fstype(self):
-        return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext3', TYPE_XFS: 'xfs', TYPE_SWAP: 'swap' }[self.type]
+        return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext3', TYPE_EXT4: 'ext4', TYPE_XFS: 'xfs', TYPE_SWAP: 'swap' }[self.type]
 
     def fstab_options(self):
         return 'defaults'
@@ -344,7 +339,16 @@
     def get_index(self):
         """Index of the disk (starting from 0)"""
         return self.vm.filesystems.index(self)
-                
+
+    def set_type(self, type):
+        try:
+            if int(type) == type:
+                self.type = type
+            else:
+                self.type = str_to_type(type)
+        except ValueError, e:
+            self.type = str_to_type(type)
+
 def parse_size(size_str):
     """Takes a size like qemu-img would accept it and returns the size in MB"""
     try:
@@ -366,6 +370,7 @@
 
 str_to_type_map = { 'ext2': TYPE_EXT2,
                  'ext3': TYPE_EXT3,
+                 'ext4': TYPE_EXT4,
                  'xfs': TYPE_XFS,
                  'swap': TYPE_SWAP,
                  'linux-swap': TYPE_SWAP }

=== modified file 'VMBuilder/plugins/ubuntu/distro.py'
--- VMBuilder/plugins/ubuntu/distro.py	2009-10-05 11:06:37 +0000
+++ VMBuilder/plugins/ubuntu/distro.py	2010-01-04 19:54:14 +0000
@@ -29,7 +29,7 @@
 class Ubuntu(Distro):
     name = 'Ubuntu'
     arg = 'ubuntu'
-    suites = ['dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic']
+    suites = ['dapper', 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid']
     
     # Maps host arch to valid guest archs
     valid_archs = { 'amd64' : ['amd64', 'i386', 'lpia' ],
@@ -143,6 +143,9 @@
             self.get_ec2_ramdisk()
             self.apply_ec2_settings()
 
+        if getattr(self.suite, 'set_filesystem_types', False):
+            self.suite.set_filesystem_types()
+
     def install(self, destdir):
         self.destdir = destdir
         self.suite.install(destdir)

=== modified file 'VMBuilder/plugins/ubuntu/karmic.py'
--- VMBuilder/plugins/ubuntu/karmic.py	2009-09-25 19:14:04 +0000
+++ VMBuilder/plugins/ubuntu/karmic.py	2010-01-04 19:54:14 +0000
@@ -29,3 +29,10 @@
 
     def pre_install(self):
         self.vm.install_file('/etc/hosts', contents='')
+
+    def set_filesystem_types(self):
+        # Default for Karmic and later is ext4
+        for disk in self.vm.disks:
+            for partition in disk.partitions:
+                if partition.parted_fstype() == "ext2":
+                    partition.set_type('ext4')

=== added file 'VMBuilder/plugins/ubuntu/lucid.py'
--- VMBuilder/plugins/ubuntu/lucid.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ubuntu/lucid.py	2010-01-04 19:54:14 +0000
@@ -0,0 +1,26 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2007-2009 Canonical Ltd.
+#
+#    See AUTHORS for list of contributors
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+import suite
+import logging
+import VMBuilder.disk as disk
+from   VMBuilder.util import run_cmd
+from   VMBuilder.plugins.ubuntu.karmic import Karmic
+
+class Lucid(Karmic):
+    pass