rpms/python-virtinst/devel virtinst-0.300.1-remove-usb-tablet.patch, NONE, 1.1 python-virtinst.spec, 1.27, 1.28
Daniel P. Berrange (berrange)
fedora-extras-commits at redhat.com
Thu Oct 4 16:45:57 UTC 2007
Author: berrange
Update of /cvs/pkgs/rpms/python-virtinst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1424
Modified Files:
python-virtinst.spec
Added Files:
virtinst-0.300.1-remove-usb-tablet.patch
Log Message:
Disable USB tablet for non-windows (rhbz #302951)
virtinst-0.300.1-remove-usb-tablet.patch:
--- NEW FILE virtinst-0.300.1-remove-usb-tablet.patch ---
Only in virtinst-0.300.1.new: .coverage
diff -rup virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-block.xml virtinst-0.300.1.new/tests/boot-fullyvirt-disk-block.xml
--- virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-block.xml 2007-09-25 11:01:12.000000000 -0400
+++ virtinst-0.300.1.new/tests/boot-fullyvirt-disk-block.xml 2007-10-04 12:10:00.000000000 -0400
@@ -28,7 +28,7 @@
</disk>
- <input type='tablet' bus='usb'/>
+ <input type='mouse' bus='ps2'/>
<graphics type='sdl'/>
</devices>
</domain>
diff -rup virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-file.xml virtinst-0.300.1.new/tests/boot-fullyvirt-disk-file.xml
--- virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-file.xml 2007-09-25 11:01:12.000000000 -0400
+++ virtinst-0.300.1.new/tests/boot-fullyvirt-disk-file.xml 2007-10-04 12:10:17.000000000 -0400
@@ -28,7 +28,7 @@
</disk>
- <input type='tablet' bus='usb'/>
+ <input type='mouse' bus='ps2'/>
<graphics type='sdl'/>
</devices>
</domain>
diff -rup virtinst-0.300.1.orig/tests/install-fullyvirt-disk-block.xml virtinst-0.300.1.new/tests/install-fullyvirt-disk-block.xml
--- virtinst-0.300.1.orig/tests/install-fullyvirt-disk-block.xml 2007-09-25 11:01:12.000000000 -0400
+++ virtinst-0.300.1.new/tests/install-fullyvirt-disk-block.xml 2007-10-04 12:10:29.000000000 -0400
@@ -29,7 +29,7 @@
</disk>
- <input type='tablet' bus='usb'/>
+ <input type='mouse' bus='ps2'/>
<graphics type='sdl'/>
</devices>
</domain>
diff -rup virtinst-0.300.1.orig/tests/install-fullyvirt-disk-file.xml virtinst-0.300.1.new/tests/install-fullyvirt-disk-file.xml
--- virtinst-0.300.1.orig/tests/install-fullyvirt-disk-file.xml 2007-09-25 11:01:12.000000000 -0400
+++ virtinst-0.300.1.new/tests/install-fullyvirt-disk-file.xml 2007-10-04 12:10:37.000000000 -0400
@@ -29,7 +29,7 @@
</disk>
- <input type='tablet' bus='usb'/>
+ <input type='mouse' bus='ps2'/>
<graphics type='sdl'/>
</devices>
</domain>
diff -rup virtinst-0.300.1.orig/virtinst/FullVirtGuest.py virtinst-0.300.1.new/virtinst/FullVirtGuest.py
--- virtinst-0.300.1.orig/virtinst/FullVirtGuest.py 2007-09-25 11:01:12.000000000 -0400
+++ virtinst-0.300.1.new/virtinst/FullVirtGuest.py 2007-10-04 12:02:36.000000000 -0400
@@ -27,6 +27,7 @@ class FullVirtGuest(Guest.XenGuest):
"acpi": True, \
"apic": True, \
"continue": False, \
+ "input": [ "mouse", "ps2"],
"variants": { "rhel2.1": { "label": "Red Hat Enterprise Linux 2.1", "distro": "rhel" }, \
"rhel3": { "label": "Red Hat Enterprise Linux 3", "distro": "rhel" }, \
"rhel4": { "label": "Red Hat Enterprise Linux 4", "distro": "rhel" }, \
@@ -44,6 +45,7 @@ class FullVirtGuest(Guest.XenGuest):
"acpi": True, \
"apic": True, \
"continue": True, \
+ "input": [ "tablet", "usb"],
"variants": { "winxp": { "label": "Microsoft Windows XP", \
"acpi": False, \
"apic": False }, \
@@ -58,6 +60,7 @@ class FullVirtGuest(Guest.XenGuest):
"acpi": True,
"apic": True,
"continue": False, \
+ "input": [ "mouse", "ps2"],
"variants": { "solaris9": { "label": "Sun Solaris 9" }, \
"solaris10": { "label": "Sun Solaris 10" }, \
"freebsd6": { "label": "Free BSD 6.x" }, \
@@ -68,6 +71,7 @@ class FullVirtGuest(Guest.XenGuest):
"acpi": True,
"apic": True,
"continue": False,
+ "input": [ "mouse", "ps2"],
"variants": { "msdos": { "label": "MS-DOS", \
"acpi": False, \
"apic": False }, \
@@ -161,7 +165,10 @@ class FullVirtGuest(Guest.XenGuest):
os_distro = property(get_os_distro)
def get_input_device(self):
- return ("tablet", "usb")
+ if self.os_type is None or not FullVirtGuest.OS_TYPES.has_key(self.os_type):
+ return ("mouse", "ps2")
+ input = FullVirtGuest.OS_TYPES[self.os_type]["input"]
+ return (input[0], input[1])
def _get_features_xml(self):
ret = "<features>\n"
Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/devel/python-virtinst.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- python-virtinst.spec 25 Sep 2007 15:20:00 -0000 1.27
+++ python-virtinst.spec 4 Oct 2007 16:45:24 -0000 1.28
@@ -11,8 +11,9 @@
Summary: Python modules for starting Xen guest installations
Name: python-%{appname}
Version: 0.300.1
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+Patch1: %{appname}-%{version}-remove-usb-tablet.patch
License: GPL
Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +36,7 @@
%prep
%setup -q -n %{appname}-%{version}
+%patch1 -p1
%build
python setup.py build
@@ -64,6 +66,9 @@
%{_bindir}/virt-image
%changelog
+* Thu Oct 4 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.1-2.fc8
+- Remove USB tablet for all except Windows (rhbz #302951)
+
* Tue Sep 25 2007 Daniel P. Berrange <berrange at redhat.com> - 0.300.1-1.fc8
- Update to 0.300.1 release
- Added PXE support
More information about the fedora-extras-commits
mailing list