pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=13

Browse Source
This commit is contained in:
OBS User unknown 2008-02-15 00:43:39 +00:00 committed by Git OBS Bridge
parent fdec2b57df
commit d91ac00663
6 changed files with 102 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
virt-manager.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Thu Feb 14 16:38:43 MST 2008 - dpmerrill@novell.com
- Changed virtman-xen-uri to correct the case where no
- connection param is passed in and uri is None
- bnc#362013
-------------------------------------------------------------------
Tue Feb 12 17:14:08 MST 2008 - dpmerrill@novell.com
- Changed virtman-desktop and virtman-xen-uri to correct invalid
- parms being passed in from YaST - now sends "-c xen:///"
- bnc#361334
-------------------------------------------------------------------
Tue Feb 12 11:39:00 MST 2008 - dpmerrill@novell.com
- Added virtman-detect to delay Hal signal connection until
- after device detection to prevent start-up delay
- bnc#361202
-------------------------------------------------------------------
Mon Feb 11 14:33:45 MST 2008 - dpmerrill@novell.com
- Added virtman-pointer to set vnc to show only one pointer
- bnc#359799
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 3 17:59:22 MST 2008 - dpmerrill@novell.com Sun Feb 3 17:59:22 MST 2008 - dpmerrill@novell.com

22
virt-manager.spec
View File

@ -9,6 +9,7 @@
# #
Name: virt-manager Name: virt-manager
%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
%define gsysconfdir /etc/opt/gnome %define gsysconfdir /etc/opt/gnome
@ -18,7 +19,7 @@ Name: virt-manager
%define virtinst_rel 2 %define virtinst_rel 2
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
Version: 0.5.3 Version: 0.5.3
Release: 2 Release: 3
Summary: Virtual Machine Manager Summary: Virtual Machine Manager
Group: System/Monitoring Group: System/Monitoring
License: GPL v2 or later License: GPL v2 or later
@ -31,6 +32,8 @@ Patch0: virtman-desktop.diff
Patch1: virtman-dbus-query.diff Patch1: virtman-dbus-query.diff
Patch2: virtman-xen-uri.diff Patch2: virtman-xen-uri.diff
Patch3: virtman-vminstall.diff Patch3: virtman-vminstall.diff
Patch4: virtman-pointer.diff
Patch5: virtman-detect.diff
# These two are just the oldest version tested # These two are just the oldest version tested
# Requires: pygtk2 >= 1.99.12-6 # Requires: pygtk2 >= 1.99.12-6
Requires: python-gtk Requires: python-gtk
@ -103,6 +106,8 @@ Authors:
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%patch5 -p1
%build %build
# autoreconf -i # autoreconf -i
@ -186,6 +191,21 @@ fi
%dir %{_datadir}/applications/YaST2 %dir %{_datadir}/applications/YaST2
%changelog %changelog
* Thu Feb 14 2008 dpmerrill@novell.com
- Changed virtman-xen-uri to correct the case where no
- connection param is passed in and uri is None
- bnc#362013
* Tue Feb 12 2008 dpmerrill@novell.com
- Changed virtman-desktop and virtman-xen-uri to correct invalid
- parms being passed in from YaST - now sends "-c xen:///"
- bnc#361334
* Tue Feb 12 2008 dpmerrill@novell.com
- Added virtman-detect to delay Hal signal connection until
- after device detection to prevent start-up delay
- bnc#361202
* Mon Feb 11 2008 dpmerrill@novell.com
- Added virtman-pointer to set vnc to show only one pointer
- bnc#359799
* Sun Feb 03 2008 dpmerrill@novell.com * Sun Feb 03 2008 dpmerrill@novell.com
- Added virtman-vminstall for connecting to vm-install - Added virtman-vminstall for connecting to vm-install
- and changed virtman-xen-uri.diff to force "xen:///" - and changed virtman-xen-uri.diff to force "xen:///"

2
virtman-desktop.diff
View File

@ -29,7 +29,7 @@ Index: virt-manager-0.5.3/src/virt-manager.desktop.in.in
Encoding=UTF-8 Encoding=UTF-8
-Categories=System; -Categories=System;
+Categories=Qt;X-SuSE-YaST; +Categories=Qt;X-SuSE-YaST;
+X-SuSE-YaST-Call=/usr/bin/virt-manager -- -c xen --yast +X-SuSE-YaST-Call=/usr/bin/virt-manager -c xen:///
+X-SuSE-YaST-Group=Virtualization +X-SuSE-YaST-Group=Virtualization
+X-SuSE-YaST-Argument= +X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-RootOnly=true

24
virtman-detect.diff Normal file
View File

@ -0,0 +1,24 @@
diff -Nuar virt-manager-0.5.3.orig/src/virtManager/connection.py virt-manager-0.5.3/src/virtManager/connection.py
--- virt-manager-0.5.3.orig/src/virtManager/connection.py 2008-02-12 11:32:25.000000000 -0700
+++ virt-manager-0.5.3/src/virtManager/connection.py 2008-02-12 11:36:04.000000000 -0700
@@ -156,13 +156,17 @@
hal_object = self.bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
self.hal_iface = dbus.Interface(hal_object, 'org.freedesktop.Hal.Manager')
+ # Find info about all current present media
+ for path in self.hal_iface.FindDeviceByCapability("net"):
+ self._device_added(path)
+
+ # Connect to signals AFTER FindDeviceByCapability. This leaves a small hole
+ # where we could miss a device add, but FindDeviceByCapability takes
+ # several seconds to execute if the signals are connected in advance...
# Track device add/removes so we can detect newly inserted CD media
self.hal_iface.connect_to_signal("DeviceAdded", self._device_added)
self.hal_iface.connect_to_signal("DeviceRemoved", self._device_removed)
- # Find info about all current present media
- for path in self.hal_iface.FindDeviceByCapability("net"):
- self._device_added(path)
except:
(type, value, stacktrace) = sys.exc_info ()
logging.error("Unable to connect to HAL to list network devices: '%s'" + \

13
virtman-pointer.diff Normal file
View File

@ -0,0 +1,13 @@
diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3/src/virtManager/console.py
--- virt-manager-0.5.3.orig/src/virtManager/console.py 2008-02-11 14:30:07.000000000 -0700
+++ virt-manager-0.5.3/src/virtManager/console.py 2008-02-11 14:31:06.000000000 -0700
@@ -84,7 +84,8 @@
else:
self.vncViewer.set_keyboard_grab(False)
self.vncViewer.set_pointer_grab(False)
- self.vncViewer.set_pointer_local(True)
+ # comment set_pointer_local to prevent 2 pointers in vnc viewer
+ # self.vncViewer.set_pointer_local(True)
self.vncViewer.connect("vnc-pointer-grab", self.notify_grabbed)
self.vncViewer.connect("vnc-pointer-ungrab", self.notify_ungrabbed)

24
virtman-xen-uri.diff
View File

@ -1,7 +1,6 @@
Index: virt-manager-0.5.3/src/virtManager/connect.py diff -Nuar virt-manager-0.5.3.orig/src/virtManager/connect.py virt-manager-0.5.3/src/virtManager/connect.py
=================================================================== --- virt-manager-0.5.3.orig/src/virtManager/connect.py 2008-02-12 16:34:35.000000000 -0700
--- virt-manager-0.5.3.orig/src/virtManager/connect.py 2008-01-10 18:17:51.000000000 -0700 +++ virt-manager-0.5.3/src/virtManager/connect.py 2008-02-12 16:35:05.000000000 -0700
+++ virt-manager-0.5.3/src/virtManager/connect.py 2008-02-03 17:30:24.000000000 -0700
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
pass pass
elif hv == HV_XEN: elif hv == HV_XEN:
@ -11,10 +10,9 @@ Index: virt-manager-0.5.3/src/virtManager/connect.py
if os.getuid() != 0: if os.getuid() != 0:
readOnly = True readOnly = True
elif conn == CONN_TLS: elif conn == CONN_TLS:
Index: virt-manager-0.5.3/src/virt-manager.py.in diff -Nuar virt-manager-0.5.3.orig/src/virt-manager.py.in virt-manager-0.5.3/src/virt-manager.py.in
=================================================================== --- virt-manager-0.5.3.orig/src/virt-manager.py.in 2008-02-12 16:34:35.000000000 -0700
--- virt-manager-0.5.3.orig/src/virt-manager.py.in 2008-01-10 18:17:51.000000000 -0700 +++ virt-manager-0.5.3/src/virt-manager.py.in 2008-02-12 16:38:48.000000000 -0700
+++ virt-manager-0.5.3/src/virt-manager.py.in 2008-02-03 17:28:34.000000000 -0700
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
if engine.config.get_connections() is None or len(engine.config.get_connections()) == 0: if engine.config.get_connections() is None or len(engine.config.get_connections()) == 0:
tryuri = None tryuri = None
@ -24,3 +22,13 @@ Index: virt-manager-0.5.3/src/virt-manager.py.in
elif os.path.exists("/usr/bin/qemu"): elif os.path.exists("/usr/bin/qemu"):
if os.getuid() == 0: if os.getuid() == 0:
tryuri = "qemu:///system" tryuri = "qemu:///system"
@@ -248,6 +248,9 @@
gtk.window_set_default_icon_from_file(icon_dir + "/" + appname + "-icon.svg")
+ if options.uri != None and (options.uri.upper() == "XEN" or options.uri.upper().startswith("XEN:")):
+ options.uri = "xen:///"
+
if options.show and options.uri==None:
raise OptionValueError("can't use --show-* options without --connect")