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

Accepting request 36841 from Virtualization

Browse Source 
Copy from Virtualization/virt-manager based on submit request 36841 from user charlesa

OBS-URL: https://build.opensuse.org/request/show/36841
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=37
This commit is contained in:
OBS User autobuild 2010-04-02 22:21:37 +00:00 committed by Git OBS Bridge
commit 98c34a0c89
18 changed files with 141 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
virt-manager-0.8.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e7b55303a65a4e0bbbfa8c4e63b06e4b66a23afa490faa5fccc1251428ea6b1f
size 1521896

3
virt-manager-0.8.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ae4049690ab02c7b960a4f174dc6cf9a0e07f403a4f04ea5bc98f5f48b1242a
size 1574898

29
virt-manager.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Wed Mar 31 16:18:34 MDT 2010 - carnold@novell.com
- bnc#592538 - VM status is recognized as "Shutoff" in virt-manager
and virt-viewer after creating a snapshot.
-------------------------------------------------------------------
Fri Mar 26 10:49:58 MDT 2010 - carnold@novell.com
- Update to virt-manager 0.8.4
* Import install option: create a VM using an existing OS image
* Support multiple boot devices and boot order
* Watchdog device support
* Enable setting a human readable VM description.
* Option to manually specifying a bridge name, if bridge isn't
detected
- Update to virtinst 0.500.3
* virt-install: New --watchdog option: configure a virtual
watchdog dev
* virt-install: New --soundhw option: More flexible sound
configuration deprecates --sound, though back compat is
maintained
* virt-install: New --security option: configure VM security
driver
* virt-install: New --description option: set a human readable
desc
* Better OS defaults: Use <video> VGA and <sound> AC97 if
support
-------------------------------------------------------------------
Tue Mar 23 15:10:52 MDT 2010 - carnold@novell.com

17
virt-manager.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package virt-manager (Version 0.8.3)
# spec file for package virt-manager (Version 0.8.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -22,13 +22,13 @@
%define gconftool /usr/bin/gconftool-2
%define virtinst_maj 0
%define virtinst_min 500
%define virtinst_rel 2
%define virtinst_rel 3
%define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
Name: virt-manager
Summary: Virtual Machine Manager
Version: 0.8.3
Release: 3
Version: 0.8.4
Release: 1
Group: System/Monitoring
License: LGPLv2.1+
Url: http://virt-manager.et.redhat.com
@ -46,11 +46,12 @@ Patch58: virtman-help.diff
Patch59: virtman-keycombo.diff
Patch60: virtman-autoconnect.diff
Patch61: virtman-device-flags.diff
Patch62: virtman-icon.diff
Patch81: virtinst-cdrom.diff
Patch82: virtinst-storage-ocfs2.diff
ExclusiveArch: %{ix86} x86_64
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#%gconf_schemas_prereq
%gconf_schemas_prereq
#
#rpmlint BuildRequires: python
BuildRequires: gtk2-devel
@ -136,6 +137,7 @@ Authors:
%patch59 -p1
%patch60 -p1
%patch61 -p1
%patch62 -p1
pushd $RPM_BUILD_DIR/%{virtinst_name}
%patch81 -p1
%patch82 -p1
@ -155,6 +157,7 @@ popd
make install DESTDIR=$RPM_BUILD_ROOT
pushd $RPM_BUILD_DIR/%{virtinst_name}
python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{_datadir}/virt-manager
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
popd
#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la
@ -204,8 +207,12 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.glade
%dir %{_datadir}/%{name}/pixmaps
%dir %{_datadir}/%{name}/pixmaps/hicolor/
%dir %{_datadir}/%{name}/pixmaps/hicolor/*/
%dir %{_datadir}/%{name}/pixmaps/hicolor/*/*/
%{_datadir}/%{name}/pixmaps/*.png
%{_datadir}/%{name}/pixmaps/*.svg
%{_datadir}/%{name}/pixmaps/hicolor/*/*/*.png
%{_datadir}/%{name}/*.py
%dir %{_datadir}/%{name}/virtManager
%{_datadir}/%{name}/virtManager/*.py

3
virtinst-0.500.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:671204f7276af791d92f4442c24898aa234cfa64864c4923e9a6269efea86b26
size 309222

3
virtinst-0.500.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:240dc47ad78ffc0134abd7c01ac860be6435faa086f8d4415dbf5f325926324d
size 336222

8
virtinst-cdrom.diff
View File

@ -1,8 +1,8 @@
Index: virtinst-0.500.2/virtinst/VirtualDisk.py
Index: virtinst-0.500.3/virtinst/VirtualDisk.py
===================================================================
--- virtinst-0.500.2.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.2/virtinst/VirtualDisk.py
@@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice):
--- virtinst-0.500.3.orig/virtinst/VirtualDisk.py
+++ virtinst-0.500.3/virtinst/VirtualDisk.py
@@ -1441,14 +1441,18 @@ class VirtualDisk(VirtualDevice):
self.target = "hdc"
return self.target

8
virtinst-storage-ocfs2.diff
View File

@ -1,6 +1,8 @@
--- virtinst-0.500.2.orig/virtinst/Storage.py Tue Feb 23 13:54:26 2010 +0800
+++ virtinst-0.500.2/virtinst/Storage.py Tue Feb 23 13:58:59 2010 +0800
@@ -519,7 +519,7 @@
Index: virtinst-0.500.3/virtinst/Storage.py
===================================================================
--- virtinst-0.500.3.orig/virtinst/Storage.py
+++ virtinst-0.500.3/virtinst/Storage.py
@@ -522,7 +522,7 @@ class FilesystemPool(StoragePool):
get_volume_class = staticmethod(get_volume_class)
formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",

8
virtman-autoconnect.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.3/src/virtManager/engine.py
Index: virt-manager-0.8.4/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/engine.py
+++ virt-manager-0.8.3/src/virtManager/engine.py
@@ -474,7 +474,7 @@ class vmmEngine(gobject.GObject):
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
+++ virt-manager-0.8.4/src/virtManager/engine.py
@@ -689,7 +689,7 @@ class vmmEngine(gobject.GObject):
self.emit("connection-added", conn)
self.config.add_connection(conn.get_uri())
if autoconnect:

8
virtman-cdrom.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.3/src/virtManager/addhardware.py
Index: virt-manager-0.8.4/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.3/src/virtManager/addhardware.py
@@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject):
--- virt-manager-0.8.4.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.4/src/virtManager/addhardware.py
@@ -464,6 +464,7 @@ class vmmAddHardware(gobject.GObject):
if self.vm.get_hv_type() == "kvm":
add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")
if self.vm.get_connection().is_xen():

18
virtman-desktop.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/src/Makefile.am
Index: virt-manager-0.8.4/src/Makefile.am
===================================================================
--- virt-manager-0.8.3.orig/src/Makefile.am
+++ virt-manager-0.8.3/src/Makefile.am
--- virt-manager-0.8.4.orig/src/Makefile.am
+++ virt-manager-0.8.4/src/Makefile.am
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
@ -11,10 +11,10 @@ Index: virt-manager-0.8.3/src/Makefile.am
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
Index: virt-manager-0.8.3/src/Makefile.in
Index: virt-manager-0.8.4/src/Makefile.in
===================================================================
--- virt-manager-0.8.3.orig/src/Makefile.in
+++ virt-manager-0.8.3/src/Makefile.in
--- virt-manager-0.8.4.orig/src/Makefile.in
+++ virt-manager-0.8.4/src/Makefile.in
@@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
@ -24,10 +24,10 @@ Index: virt-manager-0.8.3/src/Makefile.in
desktop_DATA_IN = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
dbusdir = $(datadir)/dbus-1/services
Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
Index: virt-manager-0.8.4/src/virt-manager.desktop.in.in
===================================================================
--- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.8.3/src/virt-manager.desktop.in.in
--- virt-manager-0.8.4.orig/src/virt-manager.desktop.in.in
+++ virt-manager-0.8.4/src/virt-manager.desktop.in.in
@@ -1,9 +1,20 @@
[Desktop Entry]
_Name=Virtual Machine Manager

30
virtman-device-flags.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.3/src/virtManager/addhardware.py
Index: virt-manager-0.8.4/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.3/src/virtManager/addhardware.py
@@ -1047,6 +1047,18 @@ class vmmAddHardware(gobject.GObject):
--- virt-manager-0.8.4.orig/src/virtManager/addhardware.py
+++ virt-manager-0.8.4/src/virtManager/addhardware.py
@@ -1010,6 +1010,18 @@ class vmmAddHardware(gobject.GObject):
self._dev.get_xml_config()
logging.debug("Adding device:\n" + self._dev.get_xml_config())
@ -21,11 +21,11 @@ Index: virt-manager-0.8.3/src/virtManager/addhardware.py
# Hotplug device
attach_err = False
try:
Index: virt-manager-0.8.3/src/virtManager/details.py
Index: virt-manager-0.8.4/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/details.py
+++ virt-manager-0.8.3/src/virtManager/details.py
@@ -1194,6 +1194,17 @@ class vmmDetails(gobject.GObject):
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
@@ -1413,6 +1413,17 @@ class vmmDetails(gobject.GObject):
return
self.config.set_confirm_removedev(not skip_prompt)
@ -43,13 +43,13 @@ Index: virt-manager-0.8.3/src/virtManager/details.py
# Define the change
try:
self.vm.remove_device(dev_type, dev_id_info)
Index: virt-manager-0.8.3/src/virtManager/domain.py
Index: virt-manager-0.8.4/src/virtManager/domain.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/domain.py
+++ virt-manager-0.8.3/src/virtManager/domain.py
@@ -1286,6 +1286,10 @@ class vmmDomain(vmmDomainBase):
xml = devobj.get_xml_config()
self._backend.attachDevice(xml)
--- virt-manager-0.8.4.orig/src/virtManager/domain.py
+++ virt-manager-0.8.4/src/virtManager/domain.py
@@ -1370,6 +1370,10 @@ class vmmDomain(vmmDomainBase):
self._backend.attachDevice(devxml)
+ def attach_device_flags(self, devobj, flags):
+ xml = devobj.get_xml_config()
@ -58,7 +58,7 @@ Index: virt-manager-0.8.3/src/virtManager/domain.py
def detach_device(self, devtype, dev_id_info):
"""
Hotunplug device from running guest
@@ -1294,6 +1298,10 @@ class vmmDomain(vmmDomainBase):
@@ -1378,6 +1382,10 @@ class vmmDomain(vmmDomainBase):
if self.is_active():
self._backend.detachDevice(xml)

6
virtman-help.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
Index: virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml
===================================================================
--- virt-manager-0.8.3.orig/help/virt-manager/C/virt-manager.xml
+++ virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
--- virt-manager-0.8.4.orig/help/virt-manager/C/virt-manager.xml
+++ virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml
@@ -821,218 +821,9 @@
<title>The Create Wizard</title>
<para>The Create Wizard helps you gather the information necessary to create

12
virtman-icon.diff Normal file
View File

@ -0,0 +1,12 @@
Index: virt-manager-0.8.4/src/virt-manager.py.in
===================================================================
--- virt-manager-0.8.4.orig/src/virt-manager.py.in
+++ virt-manager-0.8.4/src/virt-manager.py.in
@@ -313,6 +313,7 @@ def main():
# Add our icon dir to icon theme
icon_theme = gtk.icon_theme_get_default()
icon_theme.prepend_search_path(icon_dir)
+ icon_theme.prepend_search_path(icon_dir + "/hicolor/32x32/action")
gtk.gdk.threads_init()
setup_glade_i18n()

22
virtman-keycombo.diff
View File

@ -1,7 +1,7 @@
Index: virt-manager-0.8.3/src/vmm-details.glade
Index: virt-manager-0.8.4/src/vmm-details.glade
===================================================================
--- virt-manager-0.8.3.orig/src/vmm-details.glade
+++ virt-manager-0.8.3/src/vmm-details.glade
--- virt-manager-0.8.4.orig/src/vmm-details.glade
+++ virt-manager-0.8.4/src/vmm-details.glade
@@ -339,11 +339,85 @@
</widget>
</child>
@ -97,11 +97,11 @@ Index: virt-manager-0.8.3/src/vmm-details.glade
<property name="visible">True</property>
</widget>
</child>
Index: virt-manager-0.8.3/src/virtManager/details.py
Index: virt-manager-0.8.4/src/virtManager/details.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/details.py
+++ virt-manager-0.8.3/src/virtManager/details.py
@@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject):
--- virt-manager-0.8.4.orig/src/virtManager/details.py
+++ virt-manager-0.8.4/src/virtManager/details.py
@@ -288,6 +288,14 @@ class vmmDetails(gobject.GObject):
"on_details_menu_send_cad_activate": self.console.send_key,
"on_details_menu_send_cab_activate": self.console.send_key,
@ -116,11 +116,11 @@ Index: virt-manager-0.8.3/src/virtManager/details.py
"on_details_menu_send_caf1_activate": self.console.send_key,
"on_details_menu_send_caf2_activate": self.console.send_key,
"on_details_menu_send_caf3_activate": self.console.send_key,
Index: virt-manager-0.8.3/src/virtManager/console.py
Index: virt-manager-0.8.4/src/virtManager/console.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/console.py
+++ virt-manager-0.8.3/src/virtManager/console.py
@@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject):
--- virt-manager-0.8.4.orig/src/virtManager/console.py
+++ virt-manager-0.8.4/src/virtManager/console.py
@@ -325,6 +325,22 @@ class vmmConsolePages(gobject.GObject):
keys = ["Control_L", "Alt_L", "Delete"]
elif src.get_name() == "details-menu-send-cab":
keys = ["Control_L", "Alt_L", "BackSpace"]

8
virtman-kvm.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.3/src/virt-manager.py.in
Index: virt-manager-0.8.4/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.3.orig/src/virt-manager.py.in
+++ virt-manager-0.8.3/src/virt-manager.py.in
@@ -209,7 +209,8 @@ def default_uri():
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
+++ virt-manager-0.8.4/src/virtManager/engine.py
@@ -69,7 +69,8 @@ def default_uri():
tryuri = "xen:///"
elif (os.path.exists("/usr/bin/qemu") or
os.path.exists("/usr/bin/qemu-kvm") or

30
virtman-netcat.diff
View File

@ -1,13 +1,19 @@
Index: virt-manager-0.8.3/src/virtManager/console.py
Index: virt-manager-0.8.4/src/virtManager/console.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/console.py
+++ virt-manager-0.8.3/src/virtManager/console.py
@@ -505,7 +505,7 @@ class vmmConsolePages(gobject.GObject):
if username:
argv += ['-l', username]
- argv += [ server, "nc", vncaddr, str(vncport) ]
+ argv += [ server, "netcat", vncaddr, str(vncport) ]
logging.debug("Creating SSH tunnel: %s" % argv)
--- virt-manager-0.8.4.orig/src/virtManager/console.py
+++ virt-manager-0.8.4/src/virtManager/console.py
@@ -515,11 +515,11 @@ class vmmConsolePages(gobject.GObject):
#
nc_params = "%s %s" % (vncaddr, str(vncport))
nc_cmd = [\
- "nc -q 2>&1 | grep -q 'requires an argument';"
+ "netcat -q 2>&1 | grep -q 'requires an argument';"
"if [ $? -eq 0 ] ; then"
- " CMD='nc -q 0 %(nc_params)s';"
+ " CMD='netcat -q 0 %(nc_params)s';"
"else"
- " CMD='nc %(nc_params)s';"
+ " CMD='netcat %(nc_params)s';"
"fi;"
"$CMD;" % {'nc_params': nc_params}
]

10
virtman-vminstall.diff
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.8.3/src/virtManager/engine.py
Index: virt-manager-0.8.4/src/virtManager/engine.py
===================================================================
--- virt-manager-0.8.3.orig/src/virtManager/engine.py
+++ virt-manager-0.8.3/src/virtManager/engine.py
@@ -38,7 +38,8 @@ from virtManager.manager import vmmManag
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
+++ virt-manager-0.8.4/src/virtManager/engine.py
@@ -40,7 +40,8 @@ from virtManager.manager import vmmManag
from virtManager.migrate import vmmMigrateDialog
from virtManager.details import vmmDetails
from virtManager.asyncjob import vmmAsyncJob
@ -12,7 +12,7 @@ Index: virt-manager-0.8.3/src/virtManager/engine.py
from virtManager.host import vmmHost
from virtManager.error import vmmErrorDialog
from virtManager.systray import vmmSystray
@@ -436,13 +437,27 @@ class vmmEngine(gobject.GObject):
@@ -650,13 +651,27 @@ class vmmEngine(gobject.GObject):
return False
return True