diff --git a/virt-manager.changes b/virt-manager.changes index edc3e24b..9bce66ba 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 2 12:11:29 MST 2014 - carnold@suse.com + +- bnc#907958 - virt-manager --debug with no screen SIGABRT + virtman-check-for-valid-display.patch + ------------------------------------------------------------------- Mon Dec 1 08:02:37 MST 2014 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index 8fc5d8ca..ec20b3ee 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define with_guestfs 0 %define askpass_package "openssh-askpass" %define qemu_user "qemu" @@ -61,6 +60,7 @@ Patch95: virtman-s390x-default-to-vminstall.patch Patch96: virtman-increase-setKeepAlive-count.patch Patch97: virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch Patch98: virtman-sync-vm-startup-for-cpu-usage.patch +Patch99: virtman-check-for-valid-display.patch Patch151: virtinst-storage-ocfs2.patch Patch152: virtinst-supported-disk-formats.patch Patch153: virtinst-support-suse-distros.patch @@ -182,6 +182,7 @@ machine). %patch96 -p1 %patch97 -p1 %patch98 -p1 +%patch99 -p1 %patch151 -p1 %patch152 -p1 %patch153 -p1 diff --git a/virtman-check-for-valid-display.patch b/virtman-check-for-valid-display.patch new file mode 100644 index 00000000..0d9f4ead --- /dev/null +++ b/virtman-check-for-valid-display.patch @@ -0,0 +1,16 @@ +--- virt-manager-1.1.0/virt-manager.orig 2014-12-02 12:08:47.000000000 -0700 ++++ virt-manager-1.1.0/virt-manager 2014-12-02 12:09:20.000000000 -0700 +@@ -175,8 +175,11 @@ def main(): + from gi.repository import Gtk + leftovers = sys.argv[1:] + +- # This will error if Gtk wasn't correctly initialized +- Gtk.Window() ++ if os.environ.has_key('DISPLAY') and os.environ['DISPLAY']: ++ # This will error if Gtk wasn't correctly initialized ++ Gtk.Window() ++ else: ++ raise Exception("Error starting virt-manager: No graphical display found") + + globals()["Gtk"] = Gtk + import virtManager.config