Merge lp:~zulcss/vmbuilder/vmbuilder-ec2-chuck into lp:vmbuilder/trunk

[Soren Hansen]

[Soren Hansen (soren)]

Chuck,

lp:~zulcss/vmbuilder/vmbuilder-ec2-chuck adds ec2-ami-tools, ncurses-term, ruby, libopenssl-ruby, and curl to the list of packages to install. Can you explain what purpose ncurses-term, ruby, libopenssl-ruby, and curl serve?

Why do you explicitly mount /sys on EC2? Doesn't mountkernfs.sh do that for you?

I don't understand the first chunk of changes to VMBuilder/plugins/ubuntu/distro.py in http://bazaar.launchpad.net/~zulcss/vmbuilder/vmbuilder-ec2-chuck/revision/294 Why does the choice of components depend on whether a ppa was defined?

Unmerged revisions

294. By Chuck Short on 2008-12-18

add support for multiverse

293. By Chuck Short on 2008-12-17

more multiverse

292. By Chuck Short on 2008-12-17

Add multiverse

291. By Chuck Short on 2008-12-17

move console inline with amazon.

290. By Chuck Short on 2008-12-17

Add ec2-ami-tools to the ec2-image.

289. By Chuck Short on 2008-12-17

added example part files.

288. By Chuck Short on 2008-12-17

no changes from this commit.

287. By Chuck Short on 2008-11-27

yarp yarp

286. By Chuck Short on 2008-11-27

password stuff

285. By Nick Barcet on 2008-11-12

update help and man

=== modified file 'VMBuilder/disk.py'
--- VMBuilder/disk.py	2008-10-20 12:42:42 +0000
+++ VMBuilder/disk.py	2008-11-12 17:28:29 +0000
@@ -32,6 +32,7 @@
 TYPE_EXT3 = 1
 TYPE_XFS = 2
 TYPE_SWAP = 3
+TYPE_SYSFS = 4
 
 class Disk(object):
     def __init__(self, vm, size='5G', preallocated=False, filename=None):
@@ -207,7 +208,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' }[self.type]
+            return { TYPE_EXT2: 'ext2', TYPE_EXT3: 'ext2', TYPE_XFS: 'ext2', TYPE_SWAP: 'linux-swap', TYPE_SYSFS: 'sysfs' }[self.type]
 
         def create(self, disk):
             """Adds partition to the disk image (does not mkfs or anything like that)"""
@@ -235,12 +236,14 @@
             return self.disk.partitions.index(self)
 
 class Filesystem(object):
-    def __init__(self, vm, size=0, preallocated=False, type=None, mntpnt=None, filename=None, devletter='a'):
+    def __init__(self, vm, size=0, preallocated=False, type=None, mntpnt=None, filename=None, devletter='a', device=''):
         self.vm = vm
         self.filename = filename
         self.size = parse_size(size)
         self.preallocated = preallocated
         self.devletter = devletter
+        self.device = device
+        self.dummy = (self.preallocated and (self.size == 0))
            
         try:
             if int(type) == type:
@@ -253,7 +256,7 @@
         self.mntpnt = mntpnt
 
     def create(self):
-        logging.info('Creating filesystem')
+        logging.info('Creating filesystem %s %d %s' % (self.mntpnt, self.size, self.dummy))
         if not self.preallocated:
             logging.info('Not preallocated, so we create it.')
             if not self.filename:
@@ -276,9 +279,10 @@
         self.mkfs()
 
     def mkfs(self):
-        cmd = self.mkfs_fstype() + [self.filename]
-        run_cmd(*cmd)
-        self.uuid = run_cmd('vol_id', '--uuid', self.filename).rstrip()
+        if not self.dummy:
+            cmd = self.mkfs_fstype() + [self.filename]
+            run_cmd(*cmd)
+            self.uuid = run_cmd('vol_id', '--uuid', self.filename).rstrip()
 
     def mkfs_fstype(self):
         if self.vm.suite in ['dapper', 'edgy', 'feisty', 'gutsy']:
@@ -289,13 +293,13 @@
             return { TYPE_EXT2: ['mkfs.ext2', '-F'], TYPE_EXT3: ['mkfs.ext3', '-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_XFS: 'xfs', TYPE_SWAP: 'swap', TYPE_SYSFS: 'sysfs' }[self.type]
 
     def fstab_options(self):
         return 'defaults'
 
     def mount(self):
-        if self.type != TYPE_SWAP: 
+        if (self.type != TYPE_SWAP) and not self.dummy:
             logging.debug('Mounting %s', self.mntpnt) 
             self.mntpath = '%s%s' % (self.vm.rootmnt, self.mntpnt)
             if not os.path.exists(self.mntpath):
@@ -305,15 +309,18 @@
 
     def umount(self):
         self.vm.cancel_cleanup(self.umount)
-        if self.type != TYPE_SWAP: 
+        if (self.type != TYPE_SWAP) and not self.dummy:
             logging.debug('Unmounting %s', self.mntpath) 
             run_cmd('umount', self.mntpath)
 
     def get_suffix(self):
         """Returns 'a4' for a device that would be called /dev/sda4 in the guest..
            This allows other parts of VMBuilder to set the prefix to something suitable."""
-        return '%s%d' % (self.devletters(), self.get_index() + 1)
-        
+        if self.device:
+            return self.device
+        else:
+            return '%s%d' % (self.devletters(), self.get_index() + 1)
+
     def devletters(self):
         """
         @rtype: string
@@ -349,7 +356,8 @@
                  'ext3': TYPE_EXT3,
                  'xfs': TYPE_XFS,
                  'swap': TYPE_SWAP,
-                 'linux-swap': TYPE_SWAP }
+                 'linux-swap': TYPE_SWAP,
+                 'sysfs': TYPE_SYSFS }
 
 def str_to_type(type):
     try:

=== modified file 'VMBuilder/plugins/__init__.py'
--- VMBuilder/plugins/__init__.py	2008-09-29 12:28:03 +0000
+++ VMBuilder/plugins/__init__.py	2008-11-27 21:03:58 +0000
@@ -19,6 +19,7 @@
 #
 import os
 import VMBuilder
+from VMBuilder.util import run_cmd
 
 def load_plugins():
     for plugin in find_plugins():
@@ -67,4 +68,11 @@
         return False
 
     def install_from_template(self, path, tmplname, context=None, mode=None):
+        if not self.vm.fsmounted:
+            raise VMBuilderException('install_from_template called while file system is not mounted')
         return self.vm.install_file(path, VMBuilder.util.render_template(self.__module__.split('.')[2], self.vm, tmplname, context), mode=mode)
+
+    def run_in_target(self, *args, **kwargs):
+        if not self.vm.fsmounted:
+            raise VMBuilderException('install_from_template called while file system is not mounted')
+        return run_cmd('chroot', self.vm.installdir, *args, **kwargs)

=== modified file 'VMBuilder/plugins/cli/__init__.py'
--- VMBuilder/plugins/cli/__init__.py	2008-10-23 21:11:22 +0000
+++ VMBuilder/plugins/cli/__init__.py	2008-11-12 19:13:07 +0000
@@ -46,7 +46,22 @@
             vm.register_setting('--optsize', metavar='SIZE', type='int', default=0, help='Size (in MB) of the /opt filesystem. If not set, no /opt filesystem will be added.')
             vm.register_setting('--swapsize', metavar='SIZE', type='int', default=1024, help='Size (in MB) of the swap partition [default: %default]')
             vm.register_setting('--raw', metavar='PATH', type='string', help="Specify a file (or block device) to as first disk image.")
-            vm.register_setting('--part', metavar='PATH', type='string', help="Allows to specify a partition table in PATH each line of partfile should specify (root first): \n    mountpoint size \none per line, separated by space, where size is in megabytes. You can have up to 4 virtual disks, a new disk starts on a line containing only '---'. ie: \n    root 2000 \n    /boot 512 \n    swap 1000 \n    --- \n    /var 8000 \n    /var/log 2000")
+            vm.register_setting('--part', metavar='PATH', type='string', help="Allows to specify a partition table in PATH each line of partfile should specify (root first): \n \
+    mountpoint size \n \
+one per line, separated by space, where size is in megabytes. You can have up to 4 virtual disks, a new disk starts on a line containing only '---'. ie: \n \
+    root 2000 \n \
+    /boot 512 \n \
+    swap 1000 \n \
+    --- \n \
+    /var 8000 \n \
+    /var/log 2000 \n \
+FSIMAGE partitions (Xen) also supports an addition third parameter which is the suffix of the device name that should be used ('a1' for /dev/sda1).  \n \
+For FSIMAGE, partitions which are declared with a size of 0 will be treated as fs to add at runtime but which do not need to be created by vmbuilder. ie: \n \
+    root 4096 a1 \n \
+    /mnt 0 b \n \
+    /sys 0 \n \
+FSIMAGE is not designed to use 'disks' as it does not have partition tables, so '---' will just be ignored.")
+
             self.set_usage(vm)
 
             vm.optparser.disable_interspersed_args()
@@ -103,16 +118,20 @@
             if vm.hypervisor.preferred_storage == VMBuilder.hypervisor.STORAGE_FS_IMAGE:
                 try:
                     for line in file(vm.part):
-                        pair = line.strip().split(' ',1)
-                        if pair[0] == 'root':
-                            vm.add_filesystem(pair[1], type='ext3', mntpnt='/')
-                        elif pair[0] == 'swap':
-                            vm.add_filesystem(pair[1], type='swap', mntpnt=None)
-                        elif pair[0] == '---':
+                        elements = line.strip().split(' ')
+                        if elements[0] == 'root':
+                            vm.add_filesystem(elements[1], type='ext3', mntpnt='/')
+                        elif elements[0] == 'swap':
+                            vm.add_filesystem(elements[1], type='swap', mntpnt=None)
+                        elif elements[0] == '---':
                             # We just ignore the user's attempt to specify multiple disks
                             pass
+                        elif elements[0] == '/sys':
+                            vm.add_filesystem(elements[1], type='sysfs', mntpnt=elements[0], preallocated=True)
+                        elif len(elements) == 3:
+                            vm.add_filesystem(elements[1], type='ext3', mntpnt=elements[0], devletter='', device=elements[2], preallocated=(int(elements[1]) == 0))
                         else:
-                            vm.add_filesystem(pair[1], type='ext3', mntpnt=pair[0])
+                            vm.add_filesystem(elements[1], type='ext3', mntpnt=elements[0])
 
                 except IOError, (errno, strerror):
                     vm.optparser.error("%s parsing --part option: %s" % (errno, strerror))

=== modified file 'VMBuilder/plugins/ec2/__init__.py'
--- VMBuilder/plugins/ec2/__init__.py	2008-10-23 21:11:22 +0000
+++ VMBuilder/plugins/ec2/__init__.py	2008-12-18 13:02:30 +0000
@@ -60,16 +60,16 @@
         if not self.vm.ec2_kernel:
             logging.debug('No ec2-aki choosen setting to default. Use --ec2-kernel to change this')
             if self.vm.arch == 'amd64':
-                self.vm.ec2_kernel = 'aki-a53adfcc'
+                self.vm.ec2_kernel = 'aki-d314f0ba'
             else:
-                self.vm.ec2_kernel = 'aki-a71cf9ce'
+                self.vm.ec2_kernel = 'aki-af14f0c6'
 
         if not self.vm.ec2_ramdisk:
             logging.debug('No ec2-ari choosen setting to default. Use --ec2-ramdisk to change this.')
             if self.vm.arch == 'amd64':
-                self.vm.ec2_ramdisk = 'ari-b31cf9da'
+                self.vm.ec2_ramdisk = 'ari-d014f0b9'
             else:
-                self.vm.ec2_ramdisk = 'ari-a51cf9cc'
+                self.vm.ec2_ramdisk = 'ari-ac14f0c5'
 
         if not self.vm.ec2_bucket:
             raise VMBuilderUserError('When building for EC2 you must provide an S3 bucket to hold the AMI')
@@ -84,7 +84,25 @@
         if not self.vm.addpkg:
              self.vm.addpkg = []
 
+        self.vm.addpkg += ['openssh-server']
         self.vm.addpkg += ['ec2-init']
+        self.vm.addpkg += ['openssh-server']
+        self.vm.addpkg += ['ec2-modules']
+        self.vm.addpkg += ['server^']
+        self.vm.addpkg += ['standard^']
+	self.vm.addpkg += ['ec2-ami-tools']
+	self.vm.addpkg += ['ncurses-term']
+	self.vm.addpkg += ['ruby', 'libopenssl-ruby', 'curl']
+
+        if not self.vm.ppa:
+            self.vm.ppa = []
+
+        self.vm.ppa += ['ubuntu-ec2']
+
+    def post_install(self):
+        logging.info("Running ec2 postinstall")
+        self.install_from_template('/etc/event.d/xvc0', 'upstart')
+        self.run_in_target('passwd', '-l', self.vm.user)
 
     def deploy(self):
         if not self.vm.ec2:
@@ -94,7 +112,7 @@
 
         run_cmd(*bundle_cmdline)
 
-        upload_cmdline = ['ec2-upload-bundle', '--manifest', '%s/%s.manifest.xml' % (self.vm.workdir, self.vm.ec2_name), '--bucket', self.vm.ec2_bucket, '--access-key', self.vm.ec2_access_key, '--secret-key', self.vm.ec2_secret_key]
+        upload_cmdline = ['ec2-upload-bundle', '--retry', '--manifest', '%s/%s.manifest.xml' % (self.vm.workdir, self.vm.ec2_name), '--bucket', self.vm.ec2_bucket, '--access-key', self.vm.ec2_access_key, '--secret-key', self.vm.ec2_secret_key]
         run_cmd(*upload_cmdline)
 
         from boto.ec2.connection import EC2Connection

=== added directory 'VMBuilder/plugins/ec2/templates'
=== added file 'VMBuilder/plugins/ec2/templates/upstart.tmpl'
--- VMBuilder/plugins/ec2/templates/upstart.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ec2/templates/upstart.tmpl	2008-12-17 17:04:38 +0000
@@ -0,0 +1,16 @@
+# tty1 - getty
+#
+# This service maintains a getty on tty1 from the point the system is
+# started until it is shut down again.
+
+start on stopped rc2
+start on stopped rc3
+start on stopped rc4
+start on stopped rc5
+
+stop on runlevel 0
+stop on runlevel 1
+stop on runlevel 6
+
+respawn
+exec /sbin/getty 38400 xvc0 vt100-nav

=== modified file 'VMBuilder/plugins/libvirt/__init__.py'
--- VMBuilder/plugins/libvirt/__init__.py	2008-10-23 10:52:39 +0000
+++ VMBuilder/plugins/libvirt/__init__.py	2008-11-06 15:38:45 +0000
@@ -26,6 +26,7 @@
     def register_options(self):
         group = self.vm.setting_group('libvirt integration')
         group.add_option('--libvirt', metavar='URI', help='Add VM to given URI')
+        group.add_option('--bridge', metavar="BRIDGE", help='Set up bridged network connected to BRIDGE.')
         self.vm.register_setting_group(group)
 
     def all_domains(self):
@@ -41,6 +42,9 @@
         self.conn = libvirt.open(self.vm.libvirt)
         if self.vm.hostname in self.all_domains() and not self.vm.overwrite:
             raise VMBuilderUserError('Domain %s already exists at %s' % (self.vm.hostname, self.vm.libvirt))
+        
+        if not self.vm.hypervisor.name == 'KVM':
+            raise VMBuilderUserError('The libvirt plugin is only equiped to work with KVM at the moment.')
 
         if not self.vm.hypervisor.name == 'KVM':
             raise VMBuilderUserError('The libvirt plugin is only equiped to work with KVM at the moment.')

=== modified file 'VMBuilder/plugins/libvirt/templates/libvirtxml.tmpl'
--- VMBuilder/plugins/libvirt/templates/libvirtxml.tmpl	2008-09-18 09:11:09 +0000
+++ VMBuilder/plugins/libvirt/templates/libvirtxml.tmpl	2008-11-06 15:36:18 +0000
@@ -15,8 +15,16 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/kvm</emulator>
+#if $bridge
+    <interface type='bridge'>
+      <source bridge='$bridge'/>
+#else
     <interface type='network'>
       <source network='default'/>
+#end if
+#if $virtio_net
+      <model type='virtio'/>
+#end if
     </interface>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' listen='127.0.0.1'/>

=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2008-10-23 10:38:15 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2008-11-27 21:06:31 +0000
@@ -34,6 +34,9 @@
                        'amd64' : ['amd64-generic', 'amd64-k8', 'amd64-k8-smp', 'amd64-server', 'amd64-xeon']}
     default_flavour = { 'i386' : 'server', 'amd64' : 'amd64-server' }
     disk_prefix = 'hd'
+    mirror = ''
+    xen_kernel_flavour = None
+    virtio_net = False
 
     def check_kernel_flavour(self, arch, flavour):
         return flavour in self.valid_flavours[arch]
@@ -85,6 +88,12 @@
         logging.debug("Installing ssh keys")
         self.install_authorized_keys()
 
+        logging.debug("Setting up final sources.list")
+        self.install_sources_list("final")
+
+        logging.debug("Copy host settings")
+        self.copy_settings()
+
         logging.debug("Making sure system is up-to-date")
         self.update()
 
@@ -118,7 +127,7 @@
             self.run_in_target('adduser', self.vm.user, group, ignore_fail=True)
 
         # Lock root account
-        self.run_in_target('chpasswd', stdin='root:!\n')
+        self.run_in_target('chpasswd', '-e', stdin='root:!\n')
 
     def kernel_name(self):
         return 'linux-image-%s' % (self.vm.flavour or self.default_flavour[self.vm.arch],)
@@ -168,9 +177,19 @@
         run_cmd('sed', '-ie', 's/^# groot.*/# groot %s/g' % bootdev.get_grub_id(), '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', '/^# kopt_2_6/ d', '%s/boot/grub/menu.lst' % self.destdir)
 
-    def install_sources_list(self):
-        self.install_from_template('/etc/apt/sources.list', 'sources.list')
-        self.run_in_target('apt-get', 'update')
+    def install_sources_list(self, final=False):
+        mirror = ''
+
+        if final:
+            # avoid running a second time if mirror does not change
+            if self.mirror != self.vm.mirror:
+                mirror = self.vm.mirror
+        else:
+            mirror = self.mirror
+        
+        if mirror:
+            self.install_from_template('/etc/apt/sources.list', 'sources.list', { 'mirror' : mirror, 'rmirror' : self.vm.mirror })
+            self.run_in_target('apt-get', 'update')
 
     def install_fstab(self):
         if self.vm.hypervisor.preferred_storage == VMBuilder.hypervisor.STORAGE_FS_IMAGE:
@@ -183,10 +202,26 @@
 
     def debootstrap(self):
         cmd = ['/usr/sbin/debootstrap', '--arch=%s' % self.vm.arch, self.vm.suite, self.destdir ]
-        if self.vm.mirror:
-            cmd += [self.vm.mirror]
+
+        if self.vm.iso:
+            isodir = '%s/isomnt' % self.destdir
+            run_cmd ('mkdir', isodir)
+            self.vm.add_clean_cmd('rmdir', isodir)
+            run_cmd ('mount', '-o', 'loop', '-t', 'iso9660', self.vm.iso, isodir)
+            self.vm.add_clean_cmd('umount', isodir)
+            self.mirror = 'file://%s' % isodir
+        elif self.vm.install_mirror:
+            self.mirror = self.vm.install_mirror
+        else:
+            self.mirror = self.vm.mirror
+
+        cmd += [self.mirror]
+
         run_cmd(*cmd)
 
+        if self.vm.iso:
+            self.mirror = "file:///isomnt"
+
     def install_kernel(self):
         self.install_from_template('/etc/kernel-img.conf', 'kernelimg', { 'updategrub' : self.updategrub }) 
         run_cmd('chroot', self.destdir, 'apt-get', '--force-yes', '-y', 'install', self.kernel_name(), 'grub')
@@ -207,9 +242,9 @@
 
     def install_from_template(self, *args, **kwargs):
         return self.vm.distro.install_from_template(*args, **kwargs)
-        
+
     def run_in_target(self, *args, **kwargs):
-        return run_cmd('chroot', self.destdir, *args, **kwargs)
+        self.vm.distro.run_in_target(*args, **kwargs)
 
     def post_mount(self, fs):
         if fs.mntpnt == '/':
@@ -218,3 +253,15 @@
             logging.debug("Creating /var/lock in root filesystem")
             os.makedirs('%s/var/lock' % fs.mntpath)
 
+    def copy_settings(self):
+        run_cmd('cp', '/etc/default/locale', '%s/etc/default/' % self.destdir)
+        run_cmd('cp', '-a', '/etc/console-setup', '%s/etc/' % self.destdir)
+        run_cmd('cp', '/etc/default/console-setup', '%s/etc/default/' % self.destdir)
+        run_cmd('cp', '/etc/timezone', '%s/etc/' % self.destdir)
+        self.run_in_target('dpkg-reconfigure', '-pcritical', 'tzdata')
+        self.run_in_target('locale-gen', 'en_US')
+        if self.vm.lang:
+            self.run_in_target('locale-gen', self.vm.lang)
+            self.install_from_template('/etc/default/locale', 'locale', { 'lang' : self.vm.lang })
+        self.run_in_target('dpkg-reconfigure', '-pcritical', 'locales')
+        self.run_in_target('dpkg-reconfigure', '-pcritical', 'console-setup')

=== modified file 'VMBuilder/plugins/ubuntu/distro.py'
--- VMBuilder/plugins/ubuntu/distro.py	2008-10-23 13:59:50 +0000
+++ VMBuilder/plugins/ubuntu/distro.py	2008-12-18 13:02:30 +0000
@@ -24,6 +24,7 @@
 import socket
 import logging
 import types
+import os
 
 class Ubuntu(Distro):
     name = 'Ubuntu'
@@ -35,12 +36,9 @@
                     'i386' : [ 'i386', 'lpia' ],
                     'lpia' : [ 'i386', 'lpia' ] }
 
-
-    def __init__(self, vm):
-        self.vm = vm
-        self.register_settings()
-
-    def register_settings(self):
+    xen_kernel = ''
+
+    def register_options(self):
         group = self.vm.setting_group('Package options')
         group.add_option('--addpkg', action='append', metavar='PKG', help='Install PKG into the guest (can be specfied multiple times).')
         group.add_option('--removepkg', action='append', metavar='PKG', help='Remove PKG from the guest (can be specfied multiple times)')
@@ -57,8 +55,10 @@
         group.add_option('--flavour', '--kernel-flavour', help='Kernel flavour to use. Default and valid options depend on architecture and suite')
         group.add_option('--iso', metavar='PATH', help='Use an iso image as the source for installation of file. Full path to the iso must be provided. If --mirror is also provided, it will be used in the final sources.list of the vm.  This requires suite and kernel parameter to match what is available on the iso, obviously.')
         group.add_option('--mirror', metavar='URL', help='Use Ubuntu mirror at URL instead of the default, which is http://archive.ubuntu.com/ubuntu for official arches and http://ports.ubuntu.com/ubuntu-ports otherwise')
+        group.add_option('--install-mirror', metavar='URL', help='Use Ubuntu mirror at URL for the installation only. Apt\'s sources.list will still use default or URL set by --mirror')
         group.add_option('--components', metavar='COMPS', help='A comma seperated list of distro components to include (e.g. main,universe).')
         group.add_option('--ppa', metavar='PPA', action='append', help='Add ppa belonging to PPA to the vm\'s sources.list.')
+        group.add_option('--lang', metavar='LANG', default=self.get_locale(), help='Set the locale to LANG [default: %default]')
         self.vm.register_setting_group(group)
 
         group = self.vm.setting_group('Settings for the initial user')
@@ -80,10 +80,19 @@
                 self.vm.mirror = 'http://archive.ubuntu.com/ubuntu'
 
         if not self.vm.components:
+	  if self.vm.ppa:
             self.vm.components = ['main', 'restricted', 'universe']
+	  else:
+            self.vm.components = ['main', 'restricted', 'universe', 'multiverse']
         else:
             self.vm.components = self.vm.components.split(',')
-        
+
+    def get_locale(self):
+        try:
+            return os.environ['LANG']
+        except:
+            return None
+
     def preflight_check(self):
         """While not all of these are strictly checks, their failure would inevitably
         lead to failure, and since we can check them before we start setting up disk
@@ -107,17 +116,21 @@
             if type(self.vm.components) is str:
                 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())
+
+        self.vm.virtio_net = self.use_virtio_net()
+
     def install(self, destdir):
         self.destdir = destdir
-
-        self.xen_kernel_path = getattr(self.suite, 'xen_kernel_path', lambda : None)
-        self.xen_ramdisk_path = getattr(self.suite, 'xen_ramdisk_path', lambda: None)
-
         self.suite.install(destdir)
 
     def post_mount(self, fs):
         self.suite.post_mount(fs)
 
+    def use_virtio_net(self):
+        return self.suite.virtio_net
+
     def install_bootloader(self):
         devmapfile = '%s/device.map' % self.vm.workdir
         devmap = open(devmapfile, 'w')
@@ -128,4 +141,37 @@
 setup (hd0)
 EOT''')
 
+    def xen_kernel_version(self):
+        if self.suite.xen_kernel_flavour:
+            if not self.xen_kernel:
+                rmad = run_cmd('rmadison', 'linux-image-%s' % self.suite.xen_kernel_flavour)
+                version = ['0', '0','0', '0']
+
+                for line in rmad.splitlines():
+                    sline = line.split('|')
+                    
+                    if sline[2].strip().startswith(self.vm.suite):
+                        vt = sline[1].strip().split('.')
+                        for i in range(4):
+                            if int(vt[i]) > int(version[i]):
+                                version = vt
+                                break
+
+                if version[0] == '0':
+                    raise VMBuilderException('Something is wrong, no valid xen kernel for the suite %s found by rmadison' % self.vm.suite)
+                
+                self.xen_kernel = '%s.%s.%s-%s' % (version[0],version[1],version[2],version[3])
+            return self.xen_kernel
+        else:
+            raise VMBuilderUserError('There is no valid xen kernel for the suite selected.')
+
+    def xen_kernel_path(self):
+        path = '/boot/vmlinuz-%s-%s' % (self.xen_kernel_version(), self.suite.xen_kernel_flavour)
+        return path
+
+    def xen_ramdisk_path(self):
+        path = '/boot/initrd.img-%s-%s' % (self.xen_kernel_version(), self.suite.xen_kernel_flavour)
+        return path
+
+
 register_distro(Ubuntu)

=== modified file 'VMBuilder/plugins/ubuntu/gutsy.py'
--- VMBuilder/plugins/ubuntu/gutsy.py	2008-08-29 22:14:45 +0000
+++ VMBuilder/plugins/ubuntu/gutsy.py	2008-11-03 18:23:47 +0000
@@ -28,3 +28,4 @@
                        'amd64' : ['generic', 'rt', 'server'],
                        'lpia'  : ['lpia', 'lpiacompat'] }
     default_flavour = { 'i386' : 'virtual', 'amd64' : 'server', 'lpia' : 'lpia' }
+    xen_kernel_flavour = 'xen'

=== modified file 'VMBuilder/plugins/ubuntu/hardy.py'
--- VMBuilder/plugins/ubuntu/hardy.py	2008-08-29 22:14:45 +0000
+++ VMBuilder/plugins/ubuntu/hardy.py	2008-11-06 15:36:18 +0000
@@ -21,6 +21,8 @@
 from VMBuilder.plugins.ubuntu.gutsy import Gutsy
 
 class Hardy(Gutsy):
+    virtio_net = True
+
     def xen_kernel_path(self):
         return '/boot/vmlinuz-2.6.24-19-xen'
 

=== modified file 'VMBuilder/plugins/ubuntu/intrepid.py'
--- VMBuilder/plugins/ubuntu/intrepid.py	2008-10-20 13:35:17 +0000
+++ VMBuilder/plugins/ubuntu/intrepid.py	2008-11-03 18:23:47 +0000
@@ -24,15 +24,10 @@
 from   VMBuilder.plugins.ubuntu.hardy import Hardy
 
 class Intrepid(Hardy):
-    def xen_kernel_path(self):
-        return '/boot/vmlinuz-2.6.27-7-server'
-
-    def xen_ramdisk_path(self):
-        return '/boot/initrd.img-2.6.27-7-server'
+    xen_kernel_flavour = 'server'
 
     def mangle_grub_menu_lst(self):
         bootdev = disk.bootpart(self.vm.disks)
         run_cmd('sed', '-ie', 's/^# kopt=root=\([^ ]*\)\(.*\)/# kopt=root=UUID=%s\\2/g' % bootdev.fs.uuid, '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', 's/^# groot.*/# groot=%s/g' % bootdev.fs.uuid, '%s/boot/grub/menu.lst' % self.destdir)
         run_cmd('sed', '-ie', '/^# kopt_2_6/ d', '%s/boot/grub/menu.lst' % self.destdir)
-

=== modified file 'VMBuilder/plugins/ubuntu/templates/dapper_fstab_fsimage.tmpl'
--- VMBuilder/plugins/ubuntu/templates/dapper_fstab_fsimage.tmpl	2008-10-12 20:06:10 +0000
+++ VMBuilder/plugins/ubuntu/templates/dapper_fstab_fsimage.tmpl	2008-11-12 17:28:29 +0000
@@ -1,10 +1,13 @@
 # /etc/fstab: static file system information.
 #
 # <file system>                                 <mount point>   <type>  <options>       <dump>  <pass>
-proc                                            /proc           proc    defaults        0       0
+none                                            /proc           proc    defaults        0       0
 #for $fs in $fss
-#echo '/dev/%s%-40s %-15s %-7s %-15s %d       %d\n' % ($prefix, fs.get_suffix(), fs.mntpnt, fs.fstab_fstype(), fs.fstab_options(), 0, 0)
-#*
-echo "/dev/$prefix$part.get_suffix()                                $part.mntpnt        $part.fs.fstab_fstype()    $part.fs.fstab_options()    0    0
-*#
+    #if fs.mntpnt == '/sys'
+        #echo 'none%-40s %-15s %-7s %-15s %d       %d' % ('', fs.mntpnt, fs.fstab_fstype(), fs.fstab_options(), 0, 0)
+    #elif fs.mntpnt == '/'
+        #echo '/dev/%s%-40s %-15s %-7s %-15s %d       %d\n' % ($prefix, fs.get_suffix(), fs.mntpnt, fs.fstab_fstype(), fs.fstab_options(), 1, 1)
+    #else
+        #echo '/dev/%s%-40s %-15s %-7s %-15s %d       %d\n' % ($prefix, fs.get_suffix(), fs.mntpnt, fs.fstab_fstype(), fs.fstab_options(), 0, 0)
+    #end if
 #end for

=== added file 'VMBuilder/plugins/ubuntu/templates/locale.tmpl'
--- VMBuilder/plugins/ubuntu/templates/locale.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/ubuntu/templates/locale.tmpl	2008-11-02 17:14:47 +0000
@@ -0,0 +1,1 @@
+LANG="$lang"

=== modified file 'VMBuilder/plugins/ubuntu/templates/sources.list.tmpl'
--- VMBuilder/plugins/ubuntu/templates/sources.list.tmpl	2008-09-18 09:11:09 +0000
+++ VMBuilder/plugins/ubuntu/templates/sources.list.tmpl	2008-10-31 20:00:39 +0000
@@ -1,11 +1,19 @@
 deb $mirror $suite #slurp
 #echo ' '.join($components)
 
-deb $mirror $suite-updates #slurp
-#echo ' '.join($components)
-
-deb $mirror $suite-security #slurp
-#echo ' '.join($components)
+#if $iso
+deb $rmirror $suite-updates #slurp
+#echo ' '.join($components)
+
+deb $rmirror $suite-updates #slurp
+#echo ' '.join($components)
+#else
+deb $mirror $suite-updates #slurp
+#echo ' '.join($components)
+
+deb $mirror $suite-updates #slurp
+#echo ' '.join($components)
+#end if
 
 deb http://security.ubuntu.com/ubuntu $suite-security #slurp
 #echo ' '.join($components)

=== modified file 'VMBuilder/plugins/xen/vm.py'
--- VMBuilder/plugins/xen/vm.py	2008-09-16 08:19:29 +0000
+++ VMBuilder/plugins/xen/vm.py	2008-11-11 23:01:03 +0000
@@ -31,17 +31,29 @@
     preferred_storage = VMBuilder.hypervisor.STORAGE_FS_IMAGE
     needs_bootloader = False
 
+    def register_options(self):
+        group = self.vm.setting_group('Xen option')
+        group.add_option('--xen-kernel', metavar='PATH', help='Path to the kernel to use (e.g.: /boot/vmlinux-2.6.27-7-server). Default depends on distribution and suite')
+        group.add_option('--xen-ramdisk', metavar='PATH', help='Path to the ramdisk to use (e.g.: /boot/initrd.img-2.6.27-7-server). Default depends on distribution and suite.')
+        self.vm.register_setting_group(group)
+
     def finalize(self):
         destimages = []
         for filesystem in self.vm.filesystems:
-            destfile = '%s/%s' % (self.vm.destdir, os.path.basename(filesystem.filename))
-            logging.info('Moving %s to %s' % (filesystem.filename, destfile))
-            self.vm.result_files.append(destfile)
-            run_cmd('cp', '--sparse=always', filesystem.filename, destfile)
-            os.unlink(filesystem.filename)
-            filesystem.filename = os.path.abspath(destfile)
-            destimages.append(destfile)
+            if not filesystem.preallocated:
+                destfile = '%s/%s' % (self.vm.destdir, os.path.basename(filesystem.filename))
+                logging.info('Moving %s to %s' % (filesystem.filename, destfile))
+                self.vm.result_files.append(destfile)
+                run_cmd('cp', '--sparse=always', filesystem.filename, destfile)
+                os.unlink(filesystem.filename)
+                filesystem.filename = os.path.abspath(destfile)
+                destimages.append(destfile)
     
+        if not self.vm.xen_kernel:
+            self.vm.xen_kernel = self.vm.distro.xen_kernel_path()
+        if not self.vm.xen_ramdisk:
+            self.vm.xen_ramdisk = self.vm.distro.xen_ramdisk_path()
+
         xenconf = '%s/xen.conf' % self.vm.destdir
         fp = open(xenconf, 'w')
         fp.write("""
@@ -59,6 +71,7 @@
 name = '%s'
 
 dhcp    = 'dhcp'
+vif = ['']
 
 on_poweroff = 'destroy'
 on_reboot   = 'restart'
@@ -67,8 +80,8 @@
 extra = 'xencons=tty console=tty1 console=hvc0'
 
 """  %   (self.vm.name,
-          self.vm.distro.xen_kernel_path(),
-          self.vm.distro.xen_ramdisk_path(),
+          self.vm.xen_kernel,
+          self.vm.xen_ramdisk,
           self.vm.mem,
           ',\n'.join(["'tap:aio:%s,xvda%d,w'" % (os.path.abspath(img), id+1) for (img, id) in zip(destimages, range(len(destimages)))]),
           self.vm.name))

=== modified file 'VMBuilder/util.py'
--- VMBuilder/util.py	2008-10-17 22:01:20 +0000
+++ VMBuilder/util.py	2008-11-02 17:14:47 +0000
@@ -100,6 +100,16 @@
     else:
         stdin_arg = file('/dev/null', 'w')
     proc_env = os.environ
+    # save environment state
+    try:
+        sLANG = proc_env['LANG']
+    except:
+        sLANG = ''
+    try:
+        sLC = proc_env['LC_ALL']
+    except:
+        sLC = ''
+
     proc_env['LANG'] = 'C'
     proc_env['LC_ALL'] = 'C'
     proc_env.update(env)
@@ -126,6 +136,10 @@
     status = proc.wait()
     if not ignore_fail and status != 0:
         raise VMBuilderException, "Process (%s) returned %d. stdout: %s, stderr: %s" % (args.__repr__(), status, stdout, stderr)
+
+    #restore environement state
+    proc_env['LANG'] = sLANG
+    proc_env['LC_ALL'] = sLC
     return stdout
 
 def give_to_caller(path):

=== modified file 'VMBuilder/vm.py'
--- VMBuilder/vm.py	2008-10-23 21:11:22 +0000
+++ VMBuilder/vm.py	2008-11-10 06:48:28 +0000
@@ -72,6 +72,8 @@
         #: directory where we build up the guest filesystem
         self.tmproot = None
 
+        self.fsmounted = False
+
         self.optparser = _MyOptParser(epilog="ubuntu-vm-builder is Copyright (C) 2007-2008 Canonical Ltd. and written by Soren Hansen <[e-mail]>.", usage='%prog hypervisor distro [options]')
         self.optparser.arg_help = (('hypervisor', self.hypervisor_help), ('distro', self.distro_help))
 
@@ -360,6 +362,8 @@
             fs.mount()
             self.distro.post_mount(fs)
 
+        self.fsmounted = True
+
     def umount_partitions(self):
         """Unmounts all the vm's partitions and filesystems"""
         logging.info('Unmounting target filesystem')
@@ -370,6 +374,8 @@
         for disk in self.disks:
             disk.unmap()
 
+        self.fsmounted = False
+
     def install(self):
         if self.in_place:
             self.installdir = self.rootmnt

=== modified file 'debian/changelog'
--- debian/changelog	2008-10-24 22:37:48 +0000
+++ debian/changelog	2008-12-17 14:06:11 +0000
@@ -1,3 +1,9 @@
+vm-builder (0.9.1-0ubuntu0~ppa1) intrepid; urgency=low
+
+  * Chnages for building ec2 images.
+
+ -- Chuck Short <[e-mail]>  Sun, 02 Nov 2008 14:35:43 +0100
+
 vm-builder (0.9-0ubuntu3) intrepid; urgency=low
 
   [ Johan Euphrosine ]

=== modified file 'debian/control'
--- debian/control	2008-10-24 12:15:12 +0000
+++ debian/control	2008-11-06 11:09:50 +0000
@@ -9,7 +9,7 @@
 
 Package: python-vm-builder
 Architecture: all
-Depends: kvm (>= 1:69) | qemu, debootstrap, parted, kpartx, ubuntu-keyring, ${python:Depends}, dpkg-dev, python-cheetah
+Depends: kvm (>= 1:69) | qemu, debootstrap, parted, kpartx, ubuntu-keyring, ${python:Depends}, dpkg-dev, python-cheetah, devscripts
 Recommends: python-libvirt
 XB-Python-Version: ${python:Versions}
 Description: VM builder

=== added file 'debian/python-vm-builder-ec2.docs'
--- debian/python-vm-builder-ec2.docs	1970-01-01 00:00:00 +0000
+++ debian/python-vm-builder-ec2.docs	2008-11-11 18:15:33 +0000
@@ -0,0 +1,1 @@
+examples

=== added directory 'examples'
=== added file 'examples/ec2-amd64-part-file.txt'
--- examples/ec2-amd64-part-file.txt	1970-01-01 00:00:00 +0000
+++ examples/ec2-amd64-part-file.txt	2008-12-17 14:24:09 +0000
@@ -0,0 +1,2 @@
+root 4096 a1
+/mnt 0 b

=== added file 'examples/ec2-firstboot.sh'
--- examples/ec2-firstboot.sh	1970-01-01 00:00:00 +0000
+++ examples/ec2-firstboot.sh	2008-11-11 18:15:33 +0000
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+#
+# Regenerate the ssh host key
+#
+
+rm -f /etc/ssh/ssh_host_*_key*
+
+ssh-keygen -f /etc/ssh/ssh_host_rsa_key -t rsa -N '' | logger -s -t "ec2"
+ssh-keygen -f /etc/ssh/ssh_host_dsa_key -t dsa -N '' | logger -s -t "ec2"
+
+# This allows user to get host keys securely through console log
+echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" | logger -s -t "ec2"
+ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub | logger -s -t "ec2"
+ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub | logger -s -t "ec2"
+echo "-----END SSH HOST KEY FINGERPRINTS-----" | logger -s -t "ec2"
+
+depmod -a
+
+exit 0

=== added file 'examples/ec2-firstlogin.sh'
--- examples/ec2-firstlogin.sh	1970-01-01 00:00:00 +0000
+++ examples/ec2-firstlogin.sh	2008-11-11 18:15:33 +0000
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+trap cleanup 1 2 3 6
+
+cleanup() {
+   exit 1
+}
+
+ACCOUNT="ubuntu"
+
+echo
+echo "======================================================"
+echo "CONFIGURATION OF YOUR UBUNTU EC2 IMAGE"
+echo "======================================================"
+echo "Your EC2 image is about to be finished to be set up."
+echo
+echo "------------------------------------------------------"
+
+PASSWORD=$(uuidgen -r | head -c8)
+
+echo "New password for ${ACCOUNT} account: ${PASSWORD}"
+echo "ubuntu:${PASSWORD}" | chpasswd -m
+passwd -u ${ACCOUNT}
+
+echo "Setting up ssh public keys for the ${ACCOUNT} account."
+[ ! -e /home/${ACCOUNT}/.ssh ] && mkdir -p /home/${ACCOUNT}/.ssh
+cp -a /root/.ssh/authorized_keys* /home/${ACCOUNT}/.ssh
+chown -R ${ACCOUNT}:${ACCOUNT} /home/${ACCOUNT}/.ssh
+
+echo
+echo "------------------------------------------------------"
+echo "Please select software that you wish to install:"
+
+tasksel --section server
+
+echo
+echo "------------------------------------------------------"
+echo
+echo "We are now going to log you out of the root account."
+echo "To perform administrative tasks please use the ${ACCOUNT} account"
+echo "in combination with sudo using the password: ${PASSWORD}"
+echo
+echo "======================================================"
+echo
+
+touch /root/firstlogin_done
+
+kill -HUP $PPID
+

=== added file 'examples/ec2-i386-part-file.txt'
--- examples/ec2-i386-part-file.txt	1970-01-01 00:00:00 +0000
+++ examples/ec2-i386-part-file.txt	2008-12-17 14:24:09 +0000
@@ -0,0 +1,3 @@
+root 4096 a1
+/mnt 0 a2
+swap 1024 a3

=== modified file 'vmbuilder.1'
--- vmbuilder.1	2008-10-23 13:59:50 +0000
+++ vmbuilder.1	2008-11-12 19:13:07 +0000
@@ -78,6 +78,13 @@
  /var 8000      
  /var/log 2000
 .RE
+FSIMAGE partitions (Xen) also supports an addition third parameter which is the suffix of the device name that should be used ('a1' for /dev/sda1).  For FSIMAGE, partitions which are declared with a size of 0 will be treated as fs to add at runtime but which do not need to be created by vmbuilder. ie:
+.RS
+ root 4096 a1
+ /mnt 0 b
+ /sys 0
+.RE
+FSIMAGE is not designed to use "disks" as it does not have partition tables, so '---' will just be ignored.
 .RE
 .TP
 The following three options are not used if --part is specified: