← Back to branch summary

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

« back to all changes in this revision

Viewing changes to virtinst/osdict.py

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - 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.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtinst/osdict.py
267
267
            INPUT: USB_TABLET,
268
268
        }
269
269
    },
 
270
    "rhel7": {
 
271
        "label": "Red Hat Enterprise Linux 7",
 
272
        "distro": "rhel",
 
273
        "supported": False,
 
274
        "devices" : {
 
275
            DISK : VIRTIO_DISK,
 
276
            NET  : VIRTIO_NET,
 
277
            INPUT: USB_TABLET,
 
278
        }
 
279
    },
270
280
 
271
281
    "fedora5": {
272
282
        "sortby": "fedora05",
336
346
    "fedora14": {
337
347
        "label": "Fedora 14",
338
348
        "distro": "fedora",
339
 
        "supported": True,
340
349
        "devices" : {
341
350
            DISK : VIRTIO_DISK,
342
351
            NET  : VIRTIO_NET,
363
372
            INPUT: USB_TABLET,
364
373
        }
365
374
    },
 
375
    "fedora17": {
 
376
        "label": "Fedora 17",
 
377
        "distro": "fedora",
 
378
        "supported": True,
 
379
        "devices" : {
 
380
            DISK : VIRTIO_DISK,
 
381
            NET  : VIRTIO_NET,
 
382
            INPUT: USB_TABLET,
 
383
        }
 
384
    },
366
385
 
367
386
    "opensuse11": {
368
387
        "label": "openSuse 11",
405
424
    "mandriva2010": {
406
425
        "label": "Mandriva Linux 2010 and later",
407
426
        "distro": "mandriva",
408
 
        "supported": True,
409
427
        "devices" : {
410
428
            DISK : VIRTIO_DISK,
411
429
            NET  : VIRTIO_NET,
519
537
    "ubuntumaverick": {
520
538
        "label": "Ubuntu 10.10 (Maverick Meerkat)",
521
539
        "distro": "ubuntu",
522
 
        "supported": True,
523
540
        "devices" : {
524
541
            DISK : VIRTIO_DISK,
525
542
            NET  : VIRTIO_NET,
561
578
            NET  : VIRTIO_NET,
562
579
        },
563
580
    },
 
581
 
564
582
    "generic24": {
565
583
        "label": "Generic 2.4.x kernel"
566
584
    },