Ubuntu patches for next release

[Ben Kochie <ben@xxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

There are a couple patches against 400.1 that are in the Ubuntu tree.
These could probably be integrated upstream.

http://packages.ubuntu.com/source/jaunty/virtinst

In addition to these 2 patches, "ubuntuhardy" in osdict.py supports virtio 
disk, so that should be added.


- -ben

 "UNIX is user-friendly, it's just picky about its friends."
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFJrFQBfYg2asD844oRAkiCAKCY4qd73ZoMeQ2bYysPbr1yZJZuzgCgjlnp
DWi3szFYDaHRQ5xI+wYqxXM=
=as/J
-----END PGP SIGNATURE-----

From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@xxxxxxxxxxx>
Date: Fri, 30 Jan 2009 17:06:02 +0100
Subject: [PATCH] manpage typo

---
 man/en/virt-install.1   |    4 ++--
 man/en/virt-install.pod |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/en/virt-install.1 b/man/en/virt-install.1
index 97585b4..b286ec9 100644
--- a/man/en/virt-install.1
+++ b/man/en/virt-install.1
@@ -244,8 +244,8 @@ Other available options:
 Disk device type. Value can be 'cdrom', 'disk', or 'floppy'. Default is
 \&'disk'. If a 'cdrom' is specified, and no install method is chosen, the
 cdrom is used as the install media.
-.IP "\fBbux\fR" 4
-.IX Item "bux"
+.IP "\fBbus\fR" 4
+.IX Item "bus"
 Disk bus type. Value can be 'ide', 'scsi', 'usb', 'virtio' or 'xen'.  The
 default is hypervisor dependent since not all hypervisors support all bus
 types.
diff --git a/man/en/virt-install.pod b/man/en/virt-install.pod
index bfdc0f4..eb30c01 100644
--- a/man/en/virt-install.pod
+++ b/man/en/virt-install.pod
@@ -125,7 +125,7 @@ Disk device type. Value can be 'cdrom', 'disk', or 'floppy'. Default is
 'disk'. If a 'cdrom' is specified, and no install method is chosen, the
 cdrom is used as the install media.
 
-=item B<bux>
+=item B<bus>
 
 Disk bus type. Value can be 'ide', 'scsi', 'usb', 'virtio' or 'xen'.  The
 default is hypervisor dependent since not all hypervisors support all bus
-- 

Index: virtinst-0.400.1-2ubuntu1/virtinst/osdict.py
===================================================================
--- virtinst-0.400.1-2ubuntu1.orig/virtinst/osdict.py	2009-02-18 09:06:09.409914706 +0100
+++ virtinst-0.400.1-2ubuntu1/virtinst/osdict.py	2009-02-18 13:20:49.253945017 +0100
@@ -108,10 +108,19 @@
                         "disk" : { "bus"   : [ (["kvm"], "virtio") ] },
                         "net"  : { "model" : [ (["kvm"], "virtio") ] }
                       }},
-        "ubuntuhardy": { "label": "Ubuntu Hardy", "distro": "ubuntu",
+        "ubuntuhardy": { "label": "Ubuntu 8.04 LTS (Hardy Heron)", "distro": "ubuntu",
                          "devices" : {
                             "net"  : { "model" : [ (["kvm"], "virtio") ] }
                          }},
+        "ubuntuintrepid": { "label": "Ubuntu 8.10 (Intrepid Ibex)", "distro": "ubuntu",
+                         "devices" : {
+                            "net"  : { "model" : [ (["kvm"], "virtio") ] }
+                         }},
+        "ubuntujaunty": { "label": "Ubuntu 9.04 (Jaunty Jackalope)", "distro": "ubuntu",
+                         "devices" : {
+                            "net"  : { "model" : [ (["kvm"], "virtio") ] },
+                            "disk" : { "bus"   : [ (["kvm"], "virtio") ] }
+                         }},
         "generic24": { "label": "Generic 2.4.x kernel" },
         "generic26": { "label": "Generic 2.6.x kernel" },
         "virtio26": { "sortby": "genericvirtio26",

_______________________________________________
et-mgmt-tools mailing list
et-mgmt-tools@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/et-mgmt-tools