← Back to branch summary

~soren/vmbuilder/vmbuilder.refactoring

« back to all changes in this revision

Viewing changes to VMBuilder/plugins/ubuntu/distro.py

  • Committer: Soren Hansen
  • Date: 2009-12-03 11:34:24 UTC
  • Revision ID: soren@ubuntu.com-20091203113424-sqb2p1518k2oxw75
Development snapshot of the refactoring work, I'm doing. Feel free to look around now, but I'll finish this up and divide it into digestible chunks and submit it in a day or so.

Show diffs side-by-side

added added

removed removed

Lines of Context:
VMBuilder/plugins/ubuntu/distro.py
125
125
        else:
126
126
            if type(self.vm.components) is str:
127
127
                self.vm.components = self.vm.components.split(',')
128
 
 
129
 
        if self.vm.hypervisor.name == 'Xen':
130
 
            logging.info('Xen kernel default: linux-image-%s %s', self.suite.xen_kernel_flavour, self.xen_kernel_version())
 
128
# FIXME
 
129
#        if self.vm.hypervisor.name == 'Xen':
 
130
#            logging.info('Xen kernel default: linux-image-%s %s', self.suite.xen_kernel_flavour, self.xen_kernel_version())
131
131
 
132
132
        self.vm.virtio_net = self.use_virtio_net()
133
133
 
143
143
            self.get_ec2_ramdisk()
144
144
            self.apply_ec2_settings()
145
145
 
146
 
    def install(self, destdir):
147
 
        self.destdir = destdir
148
 
        self.suite.install(destdir)
 
146
    def bootstrap(self):
 
147
        self.destdir = self.vm.installdir()
 
148
        self.suite.bootstrap(self.destdir)
 
149
 
 
150
    def customise(self):
 
151
        self.destdir = self.vm.installdir()
 
152
        self.suite.install()
149
153
 
150
154
    def install_vmbuilder_log(self, logfile, rootdir):
151
155
        self.suite.install_vmbuilder_log(logfile, rootdir)