← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to virtinst/PXEInstaller.py

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/PXEInstaller.py
22
22
class PXEInstaller(Installer.Installer):
23
23
 
24
24
    # General Installer methods
25
 
 
26
 
    def prepare(self, guest, meter, distro = None):
 
25
    def prepare(self, guest, meter):
27
26
        pass
28
27
 
29
 
    def get_install_xml(self, guest, isinstall):
30
 
        bootdev = "network"
 
28
    # Internal methods
 
29
    def _get_bootdev(self, isinstall, guest):
 
30
        bootdev = self.bootconfig.BOOT_DEVICE_NETWORK
 
31
 
31
32
        if (not isinstall and
32
33
            filter(lambda d: d.device == d.DEVICE_DISK, guest.disks)):
33
34
            # If doing post-install boot and guest has an HD attached
34
 
            bootdev = "hd"
 
35
            bootdev = self.bootconfig.BOOT_DEVICE_HARDDISK
35
36
 
36
 
        return self._get_osblob_helper(isinstall=isinstall, guest=guest,
37
 
                                       kernel=None, bootdev=bootdev)
 
37
        return bootdev