Merge lp:~bzed/vmbuilder/debian into lp:vmbuilder/trunk

[Bernd Zeimetz]

[Bernd Zeimetz (bzed)]

I've added support for Debian Etch and fixed a lot of other bugs while doing so. Lenny and testing/unstable will follow soon. Had to start with Etch as I needed it for a customer...

[lp:~bzed/vmbuilder/debian]

338. By Bernd Zeimetz on 2009-06-05

Additional verbosity for template usagefor debugging.

339. By Bernd Zeimetz on 2009-06-05

Debian doesn't have a lpia arch - it was left in one help output.

340. By Bernd Zeimetz on 2009-06-05

Another template fix for virtualbox.

341. By Bernd Zeimetz on 2009-06-05

Older suite need 128 bit inode for grub to recognize os - see r250 for details.
Fixing this for etch, too.

342. By Bernd Zeimetz on 2009-06-05

Adding xen flavour for etch.

343. By Bernd Zeimetz on 2009-06-06

os_type must be Linux for virtualbox.
There doesn't seem to be a way to set it flavour on the commandline.

344. By Bernd Zeimetz on 2009-06-06

Adding missing copyright.

345. By Bernd Zeimetz on 2009-06-17

Merging trunk changes.

Unmerged revisions

345. By Bernd Zeimetz on 2009-06-17

Merging trunk changes.

344. By Bernd Zeimetz on 2009-06-06

Adding missing copyright.

343. By Bernd Zeimetz on 2009-06-06

os_type must be Linux for virtualbox.
There doesn't seem to be a way to set it flavour on the commandline.

342. By Bernd Zeimetz on 2009-06-05

Adding xen flavour for etch.

341. By Bernd Zeimetz on 2009-06-05

Older suite need 128 bit inode for grub to recognize os - see r250 for details.
Fixing this for etch, too.

340. By Bernd Zeimetz on 2009-06-05

Another template fix for virtualbox.

339. By Bernd Zeimetz on 2009-06-05

Debian doesn't have a lpia arch - it was left in one help output.

338. By Bernd Zeimetz on 2009-06-05

Additional verbosity for template usagefor debugging.

337. By Bernd Zeimetz on 2009-06-04

Add missing import os.

336. By Bernd Zeimetz on 2009-06-04

More fixes for the virtualbox deploy skript template.

=== modified file 'AUTHORS'
--- AUTHORS	2008-09-29 12:28:03 +0000
+++ AUTHORS	2009-06-02 10:32:00 +0000
@@ -2,3 +2,5 @@
 
 Other contributors:
  * Nicolas Barcet <[e-mail]>
+ * Bernd Zeimetz <[e-mail]>
+ 
\ No newline at end of file

=== modified file 'VMBuilder/__init__.py'
--- VMBuilder/__init__.py	2008-08-29 22:14:45 +0000
+++ VMBuilder/__init__.py	2009-06-04 12:22:50 +0000
@@ -21,10 +21,9 @@
 #    The publically exposed bits of VMBuilder
 #
 import logging
-import VMBuilder.plugins
+from   VMBuilder.plugins    import load_plugins, Plugin
 from   VMBuilder.distro     import Distro
 from   VMBuilder.hypervisor import Hypervisor
-from   VMBuilder.plugins    import Plugin
 from   VMBuilder.frontend   import Frontend
 from   VMBuilder.vm         import VM
 from   VMBuilder.exception  import VMBuilderException, VMBuilderUserError
@@ -66,4 +65,4 @@
     frontend.run()
 
 logging.debug('Loading plugins')
-VMBuilder.plugins.load_plugins()
+load_plugins()

=== modified file 'VMBuilder/frontend.py'
--- VMBuilder/frontend.py	2008-08-29 22:14:45 +0000
+++ VMBuilder/frontend.py	2009-06-04 00:42:28 +0000
@@ -18,22 +18,20 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #    Frontend interface and classes
-
-import VMBuilder
-import optparse
+from VMBuilder.exception import VMBuilderException
 
 class Frontend(object):
     def __init__(self):
         self.settings = []
 
-    def setting_group(self, help=None):
-        return self.SettingsGroup(help)
+    def setting_group(self, setting_help=None):
+        return self.SettingsGroup(setting_help)
     
     def add_setting_group(self, group):
         self.settings.append(group)
 
     def add_setting(self, **kwargs):
-        self.settings.append(Setting(**kwargs))
+        self.settings.append(self.Setting(**kwargs))
 
     setting_types =  ['store', 'store']
     class Setting(object):
@@ -42,8 +40,8 @@
             self.longarg = kwargs.get('shortarg', None)
             self.default = kwargs.get('default', None)
             self.help = kwargs.get('help', None)
-            type = kwargs.get('type', 'store')
-            if type not in setting_types:
+            store_type = kwargs.get('type', 'store')
+            if store_type not in Frontend.setting_types:
                 raise VMBuilderException("Invalid option type: %s" % type)
 
     class SettingsGroup(Setting):

=== modified file 'VMBuilder/hypervisor.py'
--- VMBuilder/hypervisor.py	2008-08-29 22:14:45 +0000
+++ VMBuilder/hypervisor.py	2009-06-04 12:23:59 +0000
@@ -19,12 +19,12 @@
 #
 #    Hypervisor super class
 
-import VMBuilder.plugins
+from VMBuilder import Plugin
 
 STORAGE_DISK_IMAGE = 0
 STORAGE_FS_IMAGE = 1
 
-class Hypervisor(VMBuilder.plugins.Plugin):
+class Hypervisor(Plugin):
     def finalize(self):
         raise NotImplemented('Hypervisor subclasses need to implement the finalize method')
 

=== modified file 'VMBuilder/plugins/__init__.py'
--- VMBuilder/plugins/__init__.py	2008-12-11 17:37:29 +0000
+++ VMBuilder/plugins/__init__.py	2009-06-03 22:31:00 +0000
@@ -20,6 +20,7 @@
 import os
 import VMBuilder
 from VMBuilder.util import run_cmd
+from VMBuilder.exception import VMBuilderException
 
 def load_plugins():
     for plugin in find_plugins():

=== modified file 'VMBuilder/plugins/cli/__init__.py'
--- VMBuilder/plugins/cli/__init__.py	2009-05-04 13:08:30 +0000
+++ VMBuilder/plugins/cli/__init__.py	2009-06-04 11:36:56 +0000
@@ -1,5 +1,6 @@
 #    Uncomplicated VM Builder
 #    Copyright (C) 2007-2008 Canonical Ltd.
+#    Copyright (C) 2009      Bernd Zeimetz <[e-mail]>
 #    
 #    See AUTHORS for list of contributors
 #
@@ -24,13 +25,12 @@
 import textwrap
 import VMBuilder
 from VMBuilder.disk import parse_size
-import VMBuilder.hypervisor
 _ = gettext
 
 
 class CLI(VMBuilder.Frontend):
     arg = 'cli'
-       
+    
     def run(self):
         try:
             next = False
@@ -52,7 +52,7 @@
             self.set_usage(vm)
 
             vm.optparser.disable_interspersed_args()
-            (foo, args) = vm.optparser.parse_args()
+            args = vm.optparser.parse_args()[1]
             self.handle_args(vm, args)
             vm.optparser.enable_interspersed_args()
 
@@ -93,7 +93,7 @@
                 vm.add_filesystem(size='%dM' % vm.rootsize, type='ext3', mntpnt='/')
                 vm.add_filesystem(size='%dM' % vm.swapsize, type='swap', mntpnt=None)
                 if vm.optsize > 0:
-                    vm.add_filesystem(size='%dM' % optsize, type='ext3', mntpnt='/opt')
+                    vm.add_filesystem(size='%dM' % vm.optsize, type='ext3', mntpnt='/opt')
             else:
                 if vm.raw:
                     disk = vm.add_disk(filename=vm.raw, preallocated=True)
@@ -161,22 +161,38 @@
                 disk.add_part(offset, int(pair[1]), 'ext3', pair[0])
             offset += int(pair[1])
 
-class UVB(CLI):
-    arg = 'ubuntu-vm-builder'
+class VB(CLI):
+    arg = 'vb'
+    suites = []
+    distro = ''
 
     def set_usage(self, vm):
         vm.optparser.set_usage('%prog hypervisor suite [options]')
         vm.optparser.arg_help = (('hypervisor', vm.hypervisor_help), ('suite', self.suite_help))
 
     def suite_help(self):
-        return 'Suite. Valid options: %s' % " ".join(VMBuilder.plugins.ubuntu.distro.Ubuntu.suites)
+        return 'Suite. Valid options: %s' % " ".join(self.suites)
 
     def handle_args(self, vm, args):
         if len(args) < 2:
             vm.optparser.error("You need to specify at least the hypervisor type and the suite")
         vm.set_hypervisor(args[0])
-        vm.set_distro('ubuntu')
+        vm.set_distro(self.distro)
         vm.suite = args[1]
  
+class UVB(VB):
+    arg = 'ubuntu-vm-builder'
+    import VMBuilder.plugins.ubuntu as ubuntu
+    suites = ubuntu.distro.Ubuntu.suites
+    distro = 'ubuntu'
+
+class DVB(VB):
+    arg = 'debian-vm-builder'
+    import VMBuilder.plugins.debian as debian
+    suites = debian.distro.Debian.suites
+    distro = 'debian'
+
+
 VMBuilder.register_frontend(CLI)
 VMBuilder.register_frontend(UVB)
+VMBuilder.register_frontend(DVB)

=== added directory 'VMBuilder/plugins/debian'
=== added file 'VMBuilder/plugins/debian/__init__.py'
--- VMBuilder/plugins/debian/__init__.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/__init__.py	2009-06-02 12:04:26 +0000
@@ -0,0 +1,21 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2007-2008 Canonical Ltd.
+#    Copyright (C) 2009      Bernd Zeimetz <[e-mail]>
+#    
+#    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 as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    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 distro

=== added file 'VMBuilder/plugins/debian/distro.py'
--- VMBuilder/plugins/debian/distro.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/distro.py	2009-06-03 09:40:36 +0000
@@ -0,0 +1,195 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2007-2008 Canonical Ltd.
+#    Copyright (C) 2009      Bernd Zeimetz <[e-mail]>
+#    
+#    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 as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    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 logging
+import os
+import socket
+import types
+import VMBuilder
+from   VMBuilder           import register_distro, Distro
+from   VMBuilder.util      import run_cmd
+from   VMBuilder.exception import VMBuilderUserError, VMBuilderException
+
+class Debian(Distro):
+    name = 'Debian'
+    arg = 'debian'
+    suites = ['etch']
+    
+    # Maps host arch to valid guest archs
+    # FIXME: Running a amd64 kernel with an i386 userspace allows us to run
+    #        amd64 guests
+     
+    valid_archs = { 'amd64' : ['amd64', 'i386' ],
+                    'i386' : [ 'i386' ] }
+
+    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)')
+        self.vm.register_setting_group(group)
+
+        group = self.vm.setting_group('General OS options')
+        self.host_arch = run_cmd('dpkg', '--print-architecture').rstrip()
+        group.add_option('-a', '--arch', default=self.host_arch, help='Specify the target architecture.  Valid options: amd64 i386 lpia (defaults to host arch)')
+        group.add_option('--hostname', default='debian', help='Set NAME as the hostname of the guest. Default: debian. Also uses this name as the VM name.')
+        self.vm.register_setting_group(group)
+
+        # FIXME: Add Debian ports 
+        group = self.vm.setting_group('Installation options')
+        group.add_option('--suite', default='etch', help='Suite to install. Valid options: %s [default: %%default]' % ' '.join(self.suites))
+        group.add_option('--flavour', '--kernel-flavour', help='Kernel flavour to use. Default and valid options depend on architecture and suite')
+        group.add_option('--variant', metavar='VARIANT', help='Passed to debootstrap --variant flag; use minbase, buildd, or fakechroot.')
+        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 Debian mirror at URL instead of the default, which is http://ftp.debian.org for official arches.')
+        group.add_option('--proxy', metavar='URL', help='Use proxy at URL for cached packages')
+        group.add_option('--install-mirror', metavar='URL', help='Use Debian mirror at URL for the installation only. Apt\'s sources.list will still use default or URL set by --mirror')
+        group.add_option('--security-mirror', metavar='URL', help='Use Debian security mirror at URL instead of the default, which is http://security.debian.org/debian-security/ for official arches.')
+        group.add_option('--install-security-mirror', metavar='URL', help='Use the security mirror at URL for installation only. Apt\'s sources.list will still use default or URL set by --security-mirror')
+        group.add_option('--components', metavar='COMPS', help='A comma seperated list of distro components to include (e.g. main,contrib,non-free).')
+        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')
+        group.add_option('--user', default='debian', help='Username of initial user [default: %default]')
+        group.add_option('--name', default='Debian', help='Full name of initial user [default: %default]')
+        group.add_option('--pass', default='debian', help='Password of initial user [default: %default]')
+        group.add_option('--rootpass', help='Initial root password (WARNING: this has strong security implications).')
+        self.vm.register_setting_group(group)
+
+        group = self.vm.setting_group('Other options')
+        group.add_option('--ssh-key', metavar='PATH', help='Add PATH to root\'s ~/.ssh/authorized_keys (WARNING: this has strong security implications).')
+        group.add_option('--ssh-user-key', help='Add PATH to the user\'s ~/.ssh/authorized_keys.')
+        self.vm.register_setting_group(group)
+
+    def set_defaults(self):
+        if not self.vm.mirror:
+            #if self.vm.arch == 'lpia':
+            #    self.vm.mirror = 'http://ports.ubuntu.com/ubuntu-ports'
+            #else:
+            self.vm.mirror = 'http://ftp.debian.org/debian'
+
+        if not self.vm.security_mirror:
+            #if self.vm.arch == 'lpia':
+            #    self.vm.security_mirror = 'http://ports.ubuntu.com/ubuntu-ports'
+            #else:
+            self.vm.security_mirror = 'http://security.debian.org/debian-security'
+
+        if not self.vm.components:
+            self.vm.components = ['main']
+        else:
+            self.vm.components = self.vm.components.split(',')
+
+    def get_locale(self):
+        return os.getenv('LANG')
+
+    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
+        and whatnot, we might as well go ahead an do this now."""
+
+        if not self.vm.suite in self.suites:
+            raise VMBuilderUserError('Invalid suite. Valid suites are: %s' % ' '.join(self.suites))
+        
+        modname = 'VMBuilder.plugins.debian.%s' % (self.vm.suite, )
+        mod = __import__(modname, fromlist=[self.vm.suite])
+        self.suite = getattr(mod, self.vm.suite.capitalize())(self.vm)
+
+        if self.vm.arch not in self.valid_archs[self.host_arch] or  \
+            not self.suite.check_arch_validity(self.vm.arch):
+            raise VMBuilderUserError('%s is not a valid architecture. Valid architectures are: %s' % (self.vm.arch, 
+                                                                                                      ' '.join(self.valid_archs[self.host_arch])))
+
+        if not self.vm.components:
+            self.vm.components = ['main', 'restricted', 'universe']
+        else:
+            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()
+
+        if self.vm.lang:
+            try:
+                run_cmd('locale-gen', '%s' % self.vm.lang)
+            except VMBuilderException, e:
+                msg = "locale-gen does not recognize your locale '%s'" % self.vm.lang
+                raise VMBuilderUserError(msg)
+
+    def install(self, destdir):
+        self.destdir = destdir
+        self.suite.install(destdir)
+
+    def install_vmbuilder_log(self, logfile, rootdir):
+        self.suite.install_vmbuilder_log(logfile, rootdir)
+
+    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')
+        for (disk, id) in zip(self.vm.disks, range(len(self.vm.disks))):
+            devmap.write("(hd%d) %s\n" % (id, disk.filename))
+        devmap.close()
+        run_cmd('grub', '--device-map=%s' % devmapfile, '--batch',  stdin='''root (hd0,0)
+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(Debian)

=== added file 'VMBuilder/plugins/debian/etch.py'
--- VMBuilder/plugins/debian/etch.py	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/etch.py	2009-06-04 13:21:36 +0000
@@ -0,0 +1,342 @@
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2007-2008 Canonical Ltd.
+#    Copyright (C) 2009      Bernd Zeimetz <[e-mail]>
+#    
+#    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 as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    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 glob
+import logging
+import os
+import shutil
+import socket
+import tempfile
+import VMBuilder
+import VMBuilder.disk as disk
+import VMBuilder.suite as suite
+from   VMBuilder.util import run_cmd
+
+class Etch(suite.Suite):
+    updategrub = "/usr/sbin/update-grub"
+    grubroot = "/usr/lib/grub"
+
+    valid_flavours = { 'i386' :  ['486', '686', '686-bigmem',
+                                  '686-bigmem-etchnhalf', '686-etchnhalf',
+                                  '686-smp', 'vserver-686'],
+                       'amd64' : ['amd64', 'amd64-etchnhalf', 'amd64-generic',
+                                  'amd64-k8', 'amd64-k8-smp', 'vserver-amd64',
+                                  'vserver-amd64-k8-smp']}
+    
+    default_flavour = { 'i386' : '686-etchnhalf', 'amd64' : 'amd64-etchnhalf' }
+    disk_prefix = 'sd'
+    xen_kernel_flavour = None
+    virtio_net = False
+
+    def check_kernel_flavour(self, arch, flavour):
+        return flavour in self.valid_flavours[arch]
+
+    def check_arch_validity(self, arch):
+        return arch in self.valid_flavours.keys()
+        
+    def install(self, destdir):
+        self.destdir = destdir
+
+        logging.debug("debootstrapping")
+        self.debootstrap()
+
+        logging.debug("Setting up sources.list")
+        self.install_sources_list()
+
+        logging.debug("Setting up apt proxy")
+        self.install_apt_proxy()
+
+        logging.debug("Installing fstab")
+        self.install_fstab()
+
+        logging.debug("Creating devices")
+        self.create_devices()
+    
+        if self.vm.hypervisor.needs_bootloader:
+            logging.debug("Installing grub")
+            self.install_grub()
+        
+        logging.debug("Configuring guest networking")
+        self.config_network()
+
+        logging.debug("Preventing daemons from starting")
+        self.prevent_daemons_starting()
+
+        if self.vm.hypervisor.needs_bootloader:
+            logging.debug("Installing menu.list")
+            self.install_menu_lst()
+
+            logging.debug("Installing kernel")
+            self.install_kernel()
+
+            logging.debug("Creating device.map")
+            self.install_device_map()
+
+        logging.debug("Installing extra packages")
+        self.install_extras()
+
+        logging.debug("Creating initial user")
+        self.create_initial_user()
+
+        logging.debug("Installing ssh keys")
+        self.install_authorized_keys()
+
+        logging.debug("Installing locales")
+        self.install_locales()
+
+        logging.debug("Copy host settings")
+        self.copy_settings()
+
+        logging.debug("Making sure system is up-to-date")
+        self.update()
+
+        logging.debug("Setting up final sources.list")
+        self.install_sources_list(final=True)
+
+        logging.debug("Unmounting volatile lrm filesystems")
+        self.unmount_volatile()
+
+        logging.debug("Unpreventing daemons from starting")
+        self.unprevent_daemons_starting()
+
+    def update(self):
+        self.run_in_target('apt-get', '-y', '--force-yes', 'dist-upgrade',
+                           env={ 'DEBIAN_FRONTEND' : 'noninteractive' })
+        
+    def install_authorized_keys(self):
+        if self.vm.ssh_key:
+            os.mkdir('%s/root/.ssh' % self.destdir, 0700)
+            shutil.copy(self.vm.ssh_key, '%s/root/.ssh/authorized_keys' % self.destdir)
+            os.chmod('%s/root/.ssh/authorized_keys' % self.destdir, 0644)
+        if self.vm.ssh_user_key:
+            os.mkdir('%s/home/%s/.ssh' % (self.destdir, self.vm.user), 0700)
+            shutil.copy(self.vm.ssh_user_key, '%s/home/%s/.ssh/authorized_keys' % (self.destdir, self.vm.user))
+            os.chmod('%s/home/%s/.ssh/authorized_keys' % (self.destdir, self.vm.user), 0644)
+            self.run_in_target('chown', '-R', '%s:%s' % (self.vm.user,)*2, '/home/%s/.ssh/' % (self.vm.user)) 
+
+        if self.vm.ssh_user_key or self.vm.ssh_key:
+            if not self.vm.addpkg:
+                self.vm.addpkg = []
+            self.vm.addpkg += ['openssh-server']
+
+    def update_passwords(self):
+        # Set the user password, using md5
+        self.run_in_target('chpasswd', '-m', stdin=('%s:%s\n' % (self.vm.user, getattr(self.vm, 'pass'))))
+
+        # Lock root account only if we didn't set the root password
+        if self.vm.rootpass:
+            self.run_in_target('chpasswd', '-m', stdin=('%s:%s\n' % ('root', self.vm.rootpass)))
+        else:
+            self.run_in_target('chpasswd', '-e', stdin='root:!\n')
+
+    def create_initial_user(self):
+        self.run_in_target('adduser', '--disabled-password', '--gecos', self.vm.name, self.vm.user)
+        self.run_in_target('addgroup', '--system', 'admin')
+        self.run_in_target('adduser', self.vm.user, 'admin')
+
+        self.install_from_template('/etc/sudoers', 'sudoers')
+        for group in ['adm', 'audio', 'cdrom', 'dialout', 'floppy', 'video', 'plugdev', 'dip', 'netdev', 'powerdev', 'lpadmin', 'scanner']:
+            self.run_in_target('adduser', self.vm.user, group, ignore_fail=True)
+
+        self.update_passwords()
+
+    def kernel_name(self):
+        return 'linux-image-2.6-%s' % (self.vm.flavour or self.default_flavour[self.vm.arch],)
+
+    def config_network(self):
+        self.vm.install_file('/etc/hostname', self.vm.hostname)
+        self.install_from_template('/etc/hosts', 'etc_hosts', { 'hostname' : self.vm.hostname, 'domain' : self.vm.domain }) 
+        self.install_from_template('/etc/network/interfaces', 'interfaces')
+
+    def unprevent_daemons_starting(self):
+        os.unlink('%s/usr/sbin/policy-rc.d' % self.destdir)
+
+    def prevent_daemons_starting(self):
+        os.chmod(self.install_from_template('/usr/sbin/policy-rc.d', 'nostart-policy-rc.d'), 0755)
+
+    def install_extras(self):
+        if not self.vm.addpkg and not self.vm.removepkg:
+            return
+        cmd = ['apt-get', 'install', '-y', '--force-yes']
+        cmd += self.vm.addpkg or []
+        cmd += ['%s-' % pkg for pkg in self.vm.removepkg or []]
+        self.run_in_target(env={ 'DEBIAN_FRONTEND' : 'noninteractive' }, *cmd)
+        
+    def unmount_volatile(self):
+        for mntpnt in glob.glob('%s/lib/modules/*/volatile' % self.destdir):
+            logging.debug("Unmounting %s" % mntpnt)
+            run_cmd('umount', mntpnt)
+
+    def install_menu_lst(self):
+        run_cmd('mount', '--bind', '/dev', '%s/dev' % self.destdir)
+        self.vm.add_clean_cmd('umount', '%s/dev' % self.destdir, ignore_fail=True)
+
+        self.run_in_target('mount', '-t', 'proc', 'proc', '/proc')
+        self.vm.add_clean_cmd('umount', '%s/proc' % self.destdir, ignore_fail=True)
+
+        self.run_in_target(self.updategrub, '-y')
+        self.mangle_grub_menu_lst()
+        self.run_in_target(self.updategrub)
+        self.run_in_target('grub-set-default', '0')
+
+        run_cmd('umount', '%s/dev' % self.destdir)
+        run_cmd('umount', '%s/proc' % self.destdir)
+
+    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.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, final=False):
+        if final:
+            mirror, updates_mirror, security_mirror = self.vm.mirror, self.vm.mirror, self.vm.security_mirror
+        else:
+            mirror, updates_mirror, security_mirror = self.install_mirrors()
+
+        self.install_from_template('/etc/apt/sources.list', 'sources.list', { 'mirror' : mirror, 'security_mirror' : security_mirror, 'updates_mirror' : updates_mirror })
+
+        # If setting up the final mirror, allow apt-get update to fail
+        # (since we might be on a complete different network than the
+        # final vm is going to be on).
+        self.run_in_target('apt-get', 'update', ignore_fail=final)
+
+    def install_apt_proxy(self):
+        if self.vm.proxy is not None:
+            self.vm.install_file('/etc/apt/apt.conf', '// Proxy added by vmbuilder\nAcquire::http { Proxy "%s"; };' % self.vm.proxy)
+
+    def install_fstab(self):
+        if self.vm.hypervisor.preferred_storage == VMBuilder.hypervisor.STORAGE_FS_IMAGE:
+            self.install_from_template('/etc/fstab', 'etch_fstab_fsimage', { 'fss' : disk.get_ordered_filesystems(self.vm), 'prefix' : self.disk_prefix })
+        else:
+            self.install_from_template('/etc/fstab', 'etch_fstab', { 'parts' : disk.get_ordered_partitions(self.vm.disks), 'prefix' : self.disk_prefix })
+
+    def install_device_map(self):
+        self.install_from_template('/boot/grub/device.map', 'devicemap', { 'prefix' : self.disk_prefix })
+
+    def debootstrap(self):
+        cmd = ['/usr/sbin/debootstrap', '--arch=%s' % self.vm.arch]
+        if self.vm.variant:
+            cmd += ['--variant=%s' % self.vm.variant]
+        cmd += [self.vm.suite, self.destdir, self.debootstrap_mirror()]
+        kwargs = { 'env' : { 'DEBIAN_FRONTEND' : 'noninteractive' } }
+        if self.vm.proxy:
+            kwargs['env']['http_proxy'] = self.vm.proxy
+        run_cmd(*cmd, **kwargs)
+    
+    def debootstrap_mirror(self):
+        if self.vm.iso:
+            isodir = tempfile.mkdtemp()
+            self.vm.add_clean_cb(lambda:os.rmdir(isodir))
+            run_cmd('mount', '-o', 'loop', '-t', 'iso9660', self.vm.iso, isodir)
+            self.vm.add_clean_cmd('umount', isodir)
+            self.iso_mounted = True
+
+            return 'file://%s' % isodir
+        else:
+            return self.install_mirrors()[0]
+
+
+    def install_mirrors(self):
+        if self.vm.iso:
+            mirror = "file:///isomnt"
+        elif self.vm.install_mirror:
+            mirror = self.vm.install_mirror
+        else:
+            mirror = self.vm.mirror
+
+        if self.vm.install_mirror:
+            updates_mirror = self.vm.install_mirror
+        else:
+            updates_mirror = self.vm.mirror
+
+        if self.vm.install_security_mirror:
+            security_mirror = self.vm.install_security_mirror
+        else:
+            security_mirror = self.vm.security_mirror
+
+        return (mirror, updates_mirror, security_mirror)
+
+    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')
+
+    def install_grub(self):
+        self.run_in_target('apt-get', '--force-yes', '-y', 'install', 'grub')
+        run_cmd('cp', '-a', '%s%s/%s/' % (self.destdir, self.grubroot, self.vm.arch == 'amd64' and 'x86_64-pc' or 'i386-pc'), '%s/boot/grub' % self.destdir) 
+
+
+    def install_locales(self):
+        self.run_in_target('apt-get', '--force-yes', '-y', 'install', 'locales')
+
+    def create_devices(self):
+        import VMBuilder.plugins.xen
+
+        if isinstance(self.vm.hypervisor, VMBuilder.plugins.xen.Xen):
+            self.run_in_target('mknod', '/dev/xvda', 'b', '202', '0')
+            self.run_in_target('mknod', '/dev/xvda1', 'b', '202', '1')
+            self.run_in_target('mknod', '/dev/xvda2', 'b', '202', '2')
+            self.run_in_target('mknod', '/dev/xvda3', 'b', '202', '3')
+            self.run_in_target('mknod', '/dev/xvc0', 'c', '204', '191')
+
+    def install_from_template(self, *args, **kwargs):
+        return self.vm.distro.install_from_template(*args, **kwargs)
+
+    def run_in_target(self, *args, **kwargs):
+        self.vm.distro.run_in_target(*args, **kwargs)
+
+    def copy_to_target(self, infile, destpath):
+        logging.debug("Copying %s on host to %s in guest" % (infile, destpath))
+        dir = '%s/%s' % (self.destdir, os.path.dirname(destpath))
+        if not os.path.isdir(dir):
+            os.makedirs(dir)
+        if os.path.isdir(infile):
+            shutil.copytree(infile, '%s/%s' % (self.destdir, destpath))
+        else:
+            shutil.copy(infile, '%s/%s' % (self.destdir, destpath))
+
+    def post_mount(self, fs):
+        if fs.mntpnt == '/':
+            logging.debug("Creating /var/run in root filesystem")
+            os.makedirs('%s/var/run' % fs.mntpath)
+            logging.debug("Creating /var/lock in root filesystem")
+            os.makedirs('%s/var/lock' % fs.mntpath)
+
+
+    def copy_settings(self):
+        self.copy_to_target('/etc/default/locale', '/etc/default/locale')
+        csdir = '%s/etc/console-setup' % self.destdir
+        have_cs = os.path.isdir(csdir)
+        if have_cs:
+            shutil.rmtree(csdir)
+            self.copy_to_target('/etc/console-setup', '/etc/console-setup')
+            self.copy_to_target('/etc/default/console-setup', '/etc/default/console-setup')
+        self.copy_to_target('/etc/timezone', '/etc/timezone')
+        self.run_in_target('dpkg-reconfigure', '-fnoninteractive', '-pcritical', 'tzdata')
+        self.run_in_target('locale-gen', 'en_US.UTF-8')
+        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', '-fnoninteractive', '-pcritical', 'locales')
+        if have_cs:
+            self.run_in_target('dpkg-reconfigure', '-fnoninteractive', '-pcritical', 'console-setup')
+
+    def install_vmbuilder_log(self, logfile, rootdir):
+        shutil.copy(logfile, '%s/var/log/vmbuilder-install.log' % (rootdir,))

=== added directory 'VMBuilder/plugins/debian/templates'
=== added file 'VMBuilder/plugins/debian/templates/devicemap.tmpl'
--- VMBuilder/plugins/debian/templates/devicemap.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/devicemap.tmpl	2009-06-02 11:01:44 +0000
@@ -0,0 +1,3 @@
+#for $disk in $disks
+$disk.get_grub_id() /dev/$prefix$disk.devletters()
+#end for

=== added file 'VMBuilder/plugins/debian/templates/etc_hosts.tmpl'
--- VMBuilder/plugins/debian/templates/etc_hosts.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/etc_hosts.tmpl	2009-06-02 11:01:44 +0000
@@ -0,0 +1,10 @@
+127.0.0.1 localhost
+127.0.1.1 $hostname.$domain $hostname
+
+# The following lines are desirable for IPv6 capable hosts
+::1 ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts

=== added file 'VMBuilder/plugins/debian/templates/etch_fstab.tmpl'
--- VMBuilder/plugins/debian/templates/etch_fstab.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/etch_fstab.tmpl	2009-06-02 11:03:02 +0000
@@ -0,0 +1,10 @@
+# /etc/fstab: static file system information.
+#
+# <file system>                                 <mount point>   <type>  <options>       <dump>  <pass>
+proc                                            /proc           proc    defaults        0       0
+#for $part in $parts
+#echo '/dev/%s%-40s %-15s %-7s %-15s %d       %d\n' % ($prefix, part.get_suffix(), part.mntpnt, part.fs.fstab_fstype(), part.fs.fstab_options(), 0, 0)
+#*
+echo "/dev/$prefix$part.get_suffix()                                $part.mntpnt        $part.fs.fstab_fstype()    $part.fs.fstab_options()    0    0
+*#
+#end for

=== added file 'VMBuilder/plugins/debian/templates/etch_fstab_fsimage.tmpl'
--- VMBuilder/plugins/debian/templates/etch_fstab_fsimage.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/etch_fstab_fsimage.tmpl	2009-06-02 11:03:02 +0000
@@ -0,0 +1,10 @@
+# /etc/fstab: static file system information.
+#
+# <file system>                                 <mount point>   <type>  <options>       <dump>  <pass>
+proc                                            /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
+*#
+#end for

=== added file 'VMBuilder/plugins/debian/templates/interfaces.tmpl'
--- VMBuilder/plugins/debian/templates/interfaces.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/interfaces.tmpl	2009-06-02 11:01:44 +0000
@@ -0,0 +1,22 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+#if $ip == 'dhcp'
+iface eth0 inet dhcp
+#else
+iface eth0 inet static
+        address $ip
+        netmask $mask 
+        network $net
+        broadcast $bcast
+        gateway $gw 
+        # dns-* options are implemented by the resolvconf package, if installed
+        dns-nameservers $dns
+        dns-search $domain
+#end if

=== added file 'VMBuilder/plugins/debian/templates/kernelimg.tmpl'
--- VMBuilder/plugins/debian/templates/kernelimg.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/kernelimg.tmpl	2009-06-02 11:01:44 +0000
@@ -0,0 +1,8 @@
+do_symlinks = yes
+relative_links = yes
+do_bootfloppy = no
+do_initrd = yes
+link_in_boot = no
+postinst_hook = $updategrub
+postrm_hook = $updategrub
+do_bootloader = no

=== added file 'VMBuilder/plugins/debian/templates/locale.tmpl'
--- VMBuilder/plugins/debian/templates/locale.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/locale.tmpl	2009-06-02 11:01:44 +0000
@@ -0,0 +1,1 @@
+LANG="$lang"

=== added file 'VMBuilder/plugins/debian/templates/nostart-policy-rc.d.tmpl'
--- VMBuilder/plugins/debian/templates/nostart-policy-rc.d.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/nostart-policy-rc.d.tmpl	2009-06-02 11:01:44 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+while true; do
+    case "$1" in
+        -*)
+            shift
+            ;;
+        makedev)
+            exit 0
+            ;;
+        x11-common)
+            exit 0
+            ;;
+        *)
+            exit 101
+            ;;
+    esac
+done

=== added file 'VMBuilder/plugins/debian/templates/sources.list.tmpl'
--- VMBuilder/plugins/debian/templates/sources.list.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/sources.list.tmpl	2009-06-04 12:26:50 +0000
@@ -0,0 +1,6 @@
+deb $mirror $suite #slurp
+#echo ' '.join($components)
+
+deb $security_mirror $suite/updates #slurp
+#echo ' '.join($components)
+

=== added file 'VMBuilder/plugins/debian/templates/sudoers.tmpl'
--- VMBuilder/plugins/debian/templates/sudoers.tmpl	1970-01-01 00:00:00 +0000
+++ VMBuilder/plugins/debian/templates/sudoers.tmpl	2009-06-03 09:40:36 +0000
@@ -0,0 +1,33 @@
+# sudoers file.
+#
+# This file MUST be edited with the 'visudo' command as root.
+# Failure to use 'visudo' may result in syntax or file permission errors
+# that prevent sudo from running.
+#
+# See the sudoers man page for the details on how to write a sudoers file.
+#
+
+# Defaults syslog=auth, secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+
+# Host alias specification
+
+# User alias specification
+
+# Cmnd alias specification
+
+# Defaults specification
+
+# Runas alias specification
+
+# User privilege specification
+root	ALL=(ALL) ALL
+
+# Uncomment to allow people in group wheel to run all commands
+# %wheel	ALL=(ALL) ALL
+
+# Same thing without a password
+# %wheel	ALL=(ALL) NOPASSWD: ALL
+
+# Samples
+# %users  ALL=/sbin/mount /cdrom,/sbin/umount /cdrom
+# %users  localhost=/sbin/shutdown -h now

=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2009-05-07 21:00:20 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2009-06-02 10:32:59 +0000
@@ -20,12 +20,12 @@
 import glob
 import logging
 import os
-import suite
 import shutil
 import socket
 import tempfile
 import VMBuilder
 import VMBuilder.disk as disk
+import VMBuilder.suite as suite
 from   VMBuilder.util import run_cmd
 
 class Dapper(suite.Suite):

=== modified file 'VMBuilder/plugins/ubuntu/edgy.py'
--- VMBuilder/plugins/ubuntu/edgy.py	2009-05-04 13:08:30 +0000
+++ VMBuilder/plugins/ubuntu/edgy.py	2009-06-02 10:32:59 +0000
@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import logging
-import suite
 import shutil
 import os
 import VMBuilder.disk as disk
+import VMBuilder.suite as suite
 from   VMBuilder.util import run_cmd
 from   VMBuilder.plugins.ubuntu.dapper import Dapper
 

=== modified file 'VMBuilder/plugins/ubuntu/feisty.py'
--- VMBuilder/plugins/ubuntu/feisty.py	2008-08-29 22:14:45 +0000
+++ VMBuilder/plugins/ubuntu/feisty.py	2009-06-02 10:32:59 +0000
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import logging
-import suite
 import VMBuilder.disk as disk
+import VMBuilder.suite as suite
 from   VMBuilder.util import run_cmd
 from   VMBuilder.plugins.ubuntu.edgy import Edgy
 

=== modified file 'VMBuilder/plugins/ubuntu/gutsy.py'
--- VMBuilder/plugins/ubuntu/gutsy.py	2008-11-03 18:23:47 +0000
+++ VMBuilder/plugins/ubuntu/gutsy.py	2009-06-02 10:32:59 +0000
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 import logging
-import suite
 import VMBuilder.disk as disk
+import VMBuilder.suite as suite
 from   VMBuilder.util import run_cmd
 from   VMBuilder.plugins.ubuntu.feisty import Feisty
 

=== modified file 'VMBuilder/plugins/ubuntu/hardy.py'
--- VMBuilder/plugins/ubuntu/hardy.py	2008-11-06 15:36:18 +0000
+++ VMBuilder/plugins/ubuntu/hardy.py	2009-06-02 10:32:59 +0000
@@ -17,7 +17,7 @@
 #    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 VMBuilder.suite as suite
 from VMBuilder.plugins.ubuntu.gutsy import Gutsy
 
 class Hardy(Gutsy):

=== modified file 'VMBuilder/plugins/ubuntu/intrepid.py'
--- VMBuilder/plugins/ubuntu/intrepid.py	2009-02-17 14:39:16 +0000
+++ VMBuilder/plugins/ubuntu/intrepid.py	2009-06-02 10:32:59 +0000
@@ -17,9 +17,9 @@
 #    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
+import VMBuilder.suite as suite
 from   VMBuilder.util import run_cmd
 from   VMBuilder.plugins.ubuntu.hardy import Hardy
 

=== modified file 'VMBuilder/plugins/ubuntu/jaunty.py'
--- VMBuilder/plugins/ubuntu/jaunty.py	2009-05-07 21:00:20 +0000
+++ VMBuilder/plugins/ubuntu/jaunty.py	2009-06-02 10:32:59 +0000
@@ -17,9 +17,9 @@
 #    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
+import VMBuilder.suite as suite
 from   VMBuilder.util import run_cmd
 from   VMBuilder.plugins.ubuntu.intrepid import Intrepid
 

=== modified file 'VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl'
--- VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl	2009-04-25 14:45:26 +0000
+++ VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl	2009-06-04 23:13:01 +0000
@@ -12,12 +12,14 @@
 
 
 #if $os_type == "ubuntu"
-os_type = "Ubuntu"
+os_type="Ubuntu"
+#elif $os_type == "debian"
+os_type="Debian"
 #else
-os_type = "Other"
+os_type="Unknown"
 #end if
 
-disk_path = "#echo os.path.abspath(os.path.dirname($vm_disks[0]))/"#
+disk_path = "#echo os.path.abspath(os.path.dirname($vm_disks[0]))#/"
 
 
 VBoxManage createvm -name $vm_name -ostype \$os_type -register
@@ -54,7 +56,7 @@
 #end if
 
 #if $ip
-#if $ip == dhcp
+#if $ip == "dhcp"
 VBoxManage modifyvm $vm_name -nic1 nat
 #else
 VBoxManage modifyvm $vm_name -nic1 intnet 

=== modified file 'VMBuilder/plugins/virtualbox/vm.py'
--- VMBuilder/plugins/virtualbox/vm.py	2009-05-05 08:21:10 +0000
+++ VMBuilder/plugins/virtualbox/vm.py	2009-06-04 23:13:42 +0000
@@ -19,14 +19,11 @@
 #
 
 import os
-import os.path
 import stat
-import VMBuilder
-from   VMBuilder      import register_hypervisor, Hypervisor, VMBuilderUserError
-from   VMBuilder.disk import vbox_manager_path
 import VMBuilder.hypervisor
+from   VMBuilder            import register_hypervisor
 
-class VirtualBox(Hypervisor):
+class VirtualBox(VMBuilder.hypervisor.Hypervisor):
     preferred_storage = VMBuilder.hypervisor.STORAGE_DISK_IMAGE
     needs_bootloader = True
     name = 'VirtualBox'

=== renamed file 'VMBuilder/plugins/ubuntu/suite.py' => 'VMBuilder/suite.py'
=== modified file 'VMBuilder/vm.py'
--- VMBuilder/vm.py	2009-05-07 14:09:08 +0000
+++ VMBuilder/vm.py	2009-06-04 01:11:24 +0000
@@ -301,7 +301,7 @@
                 if (ipclass > 0) and (ipclass <= 127):
                     mask = 0xFF
                 elif (ipclass > 128) and (ipclass < 192):
-                    mask = OxFFFF
+                    mask = 0xFFFF
                 elif (ipclass < 224):
                     mask = 0xFFFFFF
                 else:

=== added file 'debian-vm-builder'
--- debian-vm-builder	1970-01-01 00:00:00 +0000
+++ debian-vm-builder	2009-06-03 14:54:47 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+#
+#    Uncomplicated VM Builder
+#    Copyright (C) 2007-2008 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 as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    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 sys
+#import os
+#sys.path += [os.getcwd()]
+
+import VMBuilder
+
+VMBuilder.set_frontend('ubuntu-vm-builder')
+VMBuilder.run()

=== added file 'debian-vm-builder.1'
--- debian-vm-builder.1	1970-01-01 00:00:00 +0000
+++ debian-vm-builder.1	2009-06-03 14:54:47 +0000
@@ -0,0 +1,7 @@
+.TH DEBIAN-VM-BUILDER 1 "Jun 2009"
+.SH NAME
+debian-vm-builder \- builds virtual machines from the command line
+.SH DESCRIPTION
+debian-vm-builder is now a wrapper to vmbuilder (part of the python-vm-builder package) and is only maintained for compatibility wih previous scripts.  Please see the vmbuilder man page for more information or run 
+.B vmbuilder <hypervisor> <distro> --help
+for a full list of options.

=== modified file 'setup.py'
--- setup.py	2009-02-23 14:04:47 +0000
+++ setup.py	2009-06-03 20:46:16 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 from distutils.core import setup
 import VMBuilder.plugins
 from glob import glob