← Back to branch summary

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

« back to all changes in this revision

Viewing changes to virtinst/OSDistro.py

  • Committer: Bazaar Package Importer
  • Author(s): Jean-Louis Dupond
  • Date: 2010-05-05 03:32:42 UTC
  • mfrom: (1.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100505033242-um6f6pjcc89i07m0
Tags: 0.500.3-1ubuntu1
https://launchpad.net/bugs/590068
https://launchpad.net/bugs/524318
https://launchpad.net/bugs/533048
https://launchpad.net/bugs/215084
* Merge from debian unstable. (LP: #590068)  Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Added lucid and maverick to OS list and enable virtio for it.
  - debian/patches/0003-Fix-patch-to-keyboard-configuration.patch: disable
    as the keyboard config in Ubuntu is still in /etc/default/console-setup
    and this was causing virt-manager to always default to a en-us
    keyboard. (LP: #524318)
  - debian/control: added acl package to depends. (LP: #533048)
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin (LP: #215084)
* debian/patches/9002-add-ca-keymap.patch: dropped, its now in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/OSDistro.py
630
630
    os_type = "linux"
631
631
    _boot_iso_paths   = [ "boot/boot.iso" ]
632
632
 
633
 
    def __init__(self, arch, uri, vmtype=None, scratchdir=None):
634
 
        Distro.__init__(self, arch, uri, vmtype, scratchdir)
 
633
    def __init__(self, uri, arch, vmtype=None, scratchdir=None):
 
634
        Distro.__init__(self, uri, arch, vmtype, scratchdir)
635
635
        if re.match(r'i[4-9]86', arch):
636
636
            self.arch = 'i386'
637
637
 
638
 
        # Tested with Opensuse 10, 11, and sles 10
 
638
        oldkern = "linux"
 
639
        oldinit = "initrd"
 
640
        if arch == "x86_64":
 
641
            oldkern += "64"
 
642
            oldinit += "64"
 
643
 
 
644
        # Tested with Opensuse >= 10.2, 11, and sles 10
639
645
        self._hvm_kernel_paths = [ ("boot/%s/loader/linux" % self.arch,
640
646
                                    "boot/%s/loader/initrd" % self.arch) ]
 
647
        # Tested with Opensuse 10.0
 
648
        self._hvm_kernel_paths.append(("boot/loader/%s" % oldkern,
 
649
                                       "boot/loader/%s" % oldinit))
 
650
 
641
651
        # Matches Opensuse > 10.2 and sles 10
642
652
        self._xen_kernel_paths = [ ("boot/%s/vmlinuz-xen" % self.arch,
643
653
                                    "boot/%s/initrd-xen" % self.arch) ]
858
868
    os_type = "linux"
859
869
 
860
870
    def __init__(self, uri, arch, vmtype=None, scratchdir=None):
861
 
        Distro.__init__(self, arch, uri, vmtype, scratchdir)
 
871
        Distro.__init__(self, uri, arch, vmtype, scratchdir)
862
872
        if uri.count("installer-i386"):
863
873
            self._treeArch = "i386"
864
874
        elif uri.count("installer-amd64"):