diff --git a/virt-manager.changes b/virt-manager.changes index f5b017a9..4e779925 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Feb 3 17:59:22 MST 2008 - dpmerrill@novell.com + +- Added virtman-vminstall for connecting to vm-install +- and changed virtman-xen-uri.diff to force "xen:///" +- bnc#358400 + ------------------------------------------------------------------- Sun Feb 3 14:13:14 MST 2008 - dpmerrill@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index 5d6992b5..96580a04 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -18,7 +18,7 @@ Name: virt-manager %define virtinst_rel 2 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Version: 0.5.3 -Release: 1 +Release: 2 Summary: Virtual Machine Manager Group: System/Monitoring License: GPL v2 or later @@ -30,6 +30,7 @@ Source1: %{virtinst_name}.tar.gz Patch0: virtman-desktop.diff Patch1: virtman-dbus-query.diff Patch2: virtman-xen-uri.diff +Patch3: virtman-vminstall.diff # These two are just the oldest version tested # Requires: pygtk2 >= 1.99.12-6 Requires: python-gtk @@ -101,6 +102,7 @@ Authors: %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # autoreconf -i @@ -185,6 +187,10 @@ fi %changelog * Sun Feb 03 2008 dpmerrill@novell.com +- Added virtman-vminstall for connecting to vm-install +- and changed virtman-xen-uri.diff to force "xen:///" +- bnc#358400 +* Sun Feb 03 2008 dpmerrill@novell.com - Added virtman-xen-uri.diff to fix problem starting vnc. - virtman was getting confused between "xen" and "xen:///" uris. - bnc#358397 diff --git a/virtman-vminstall.diff b/virtman-vminstall.diff new file mode 100644 index 00000000..419b79bd --- /dev/null +++ b/virtman-vminstall.diff @@ -0,0 +1,39 @@ +diff -Nuar virt-manager-0.5.3.orig/src/virtManager/engine.py virt-manager-0.5.3/src/virtManager/engine.py +--- virt-manager-0.5.3.orig/src/virtManager/engine.py 2008-02-03 17:05:01.000000000 -0700 ++++ virt-manager-0.5.3/src/virtManager/engine.py 2008-02-03 17:05:23.000000000 -0700 +@@ -34,7 +34,7 @@ + from virtManager.details import vmmDetails + from virtManager.console import vmmConsole + from virtManager.asyncjob import vmmAsyncJob +-from virtManager.create import vmmCreate ++from vminstall.gtk.interface import VMCreate as vmmCreate + from virtManager.serialcon import vmmSerialConsole + from virtManager.host import vmmHost + from virtManager.error import vmmErrorDialog +@@ -52,7 +52,7 @@ + self.windowConnect = None + self.windowPreferences = None + self.windowAbout = None +- self.windowCreate = None ++ self.windowCreate = {} + self.windowManager = None + self.connections = {} + +@@ -311,10 +311,15 @@ + con = self.get_connection(uri) + + if self.connections[uri]["windowCreate"] == None: +- create = vmmCreate(self.get_config(), con) ++ key = 0 ++ while self.windowCreate.has_key( key ): ++ key += 1 ++ create = vmmCreate(virtman=True, key=key) ++ self.windowCreate[key] = create + create.connect("action-show-console", self._do_show_console) + create.connect("action-show-terminal", self._do_show_terminal) +- create.connect("action-show-help", self._do_show_help) ++ # make sure the help matches before showing it ++ # create.connect("action-show-help", self._do_show_help) + self.connections[uri]["windowCreate"] = create + self.connections[uri]["windowCreate"].show() + diff --git a/virtman-xen-uri.diff b/virtman-xen-uri.diff index 2cc69e6a..8e33a9fa 100644 --- a/virtman-xen-uri.diff +++ b/virtman-xen-uri.diff @@ -1,13 +1,26 @@ -Index: virt-manager-0.5.3/src/virtManager/connection.py +Index: virt-manager-0.5.3/src/virtManager/connect.py =================================================================== ---- virt-manager-0.5.3.orig/src/virtManager/connection.py 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virtManager/connection.py 2008-02-03 13:36:26.000000000 -0700 -@@ -117,7 +117,7 @@ - self.connectError = None - self.uri = uri - if self.uri is None or self.uri.lower() == "xen": -- self.uri = "xen:///" -+ self.uri = "xen" - - self.state = self.STATE_DISCONNECTED - self.vmm = None +--- 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-03 17:30:24.000000000 -0700 +@@ -95,7 +95,7 @@ + pass + elif hv == HV_XEN: + if conn == CONN_LOCAL: +- uri = "xen" ++ uri = "xen:///" + if os.getuid() != 0: + readOnly = True + elif conn == CONN_TLS: +Index: virt-manager-0.5.3/src/virt-manager.py.in +=================================================================== +--- 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-03 17:28:34.000000000 -0700 +@@ -172,7 +172,7 @@ + if engine.config.get_connections() is None or len(engine.config.get_connections()) == 0: + tryuri = None + if os.path.exists("/var/lib/xend") and os.path.exists("/proc/xen"): +- tryuri = "xen" ++ tryuri = "xen:///" + elif os.path.exists("/usr/bin/qemu"): + if os.getuid() == 0: + tryuri = "qemu:///system"