|
 |
ffd6ed |
From b0fb7d90d1a9ef8f766a8468413fc749791c0e0a Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
ffd6ed |
Date: Wed, 6 May 2015 15:11:34 +0100
|
|
|
ffd6ed |
Subject: [PATCH] p2v: Switch from matchbox-window-manager to metacity.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
Matchbox only supports a single window on screen. This worked fine
|
|
|
ffd6ed |
until we added the NetworkManager connection dialog -- which tries to
|
|
|
ffd6ed |
open in a new top level window, and of course fails.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
Metacity supports multiple top-level windows so doesn't suffer this
|
|
|
ffd6ed |
problem.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
Apart from that it's hard to tell the difference between the two.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
(cherry picked from commit 9b2ca08ab543e2779a3a0da5f05b7ba4a5bc7b7d)
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
p2v/launch-virt-p2v.in | 2 +-
|
|
|
ffd6ed |
p2v/p2v.ks.in | 2 +-
|
|
|
ffd6ed |
p2v/virt-p2v-make-disk.in | 10 +++++-----
|
|
|
ffd6ed |
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/p2v/launch-virt-p2v.in b/p2v/launch-virt-p2v.in
|
|
|
ffd6ed |
index a70e5c2..d2bafe3 100755
|
|
|
ffd6ed |
--- a/p2v/launch-virt-p2v.in
|
|
|
ffd6ed |
+++ b/p2v/launch-virt-p2v.in
|
|
|
ffd6ed |
@@ -22,7 +22,7 @@
|
|
|
ffd6ed |
# and virt-p2v.
|
|
|
ffd6ed |
if [ "$1" = "run" ]; then
|
|
|
ffd6ed |
cd /
|
|
|
ffd6ed |
- matchbox-window-manager &
|
|
|
ffd6ed |
+ metacity &
|
|
|
ffd6ed |
exec @libexecdir@/virt-p2v
|
|
|
ffd6ed |
else
|
|
|
ffd6ed |
xinit "$0" run
|
|
|
ffd6ed |
diff --git a/p2v/p2v.ks.in b/p2v/p2v.ks.in
|
|
|
ffd6ed |
index 26bb925..6a3b24b 100644
|
|
|
ffd6ed |
--- a/p2v/p2v.ks.in
|
|
|
ffd6ed |
+++ b/p2v/p2v.ks.in
|
|
|
ffd6ed |
@@ -65,7 +65,7 @@ firewalld
|
|
|
ffd6ed |
/usr/bin/Xorg
|
|
|
ffd6ed |
xorg-x11-drivers
|
|
|
ffd6ed |
xorg-x11-fonts-Type1
|
|
|
ffd6ed |
-matchbox-window-manager
|
|
|
ffd6ed |
+metacity
|
|
|
ffd6ed |
pcre
|
|
|
ffd6ed |
libxml2
|
|
|
ffd6ed |
gtk2
|
|
|
ffd6ed |
diff --git a/p2v/virt-p2v-make-disk.in b/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
index fb02856..2bb364b 100644
|
|
|
ffd6ed |
--- a/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
+++ b/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
@@ -94,12 +94,12 @@ trap cleanup INT QUIT TERM EXIT ERR
|
|
|
ffd6ed |
# - Xorg drivers
|
|
|
ffd6ed |
# - some fonts
|
|
|
ffd6ed |
# - hardware support (firmware etc, RHBZ#1157679)
|
|
|
ffd6ed |
-# - matchbox (window manager, another could be used)
|
|
|
ffd6ed |
+# - metacity (window manager, another could be used)
|
|
|
ffd6ed |
#
|
|
|
ffd6ed |
# Note that libguestfs is NOT a dependency.
|
|
|
ffd6ed |
case "$osversion" in
|
|
|
ffd6ed |
centos-*|fedora-*|rhel-*|scientificlinux-*)
|
|
|
ffd6ed |
- deps=pcre,libxml2,gtk2,/usr/bin/xinit,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/Xorg,xorg-x11-drivers,xorg-x11-fonts-Type1,matchbox-window-manager,@hardware-support
|
|
|
ffd6ed |
+ deps=pcre,libxml2,gtk2,/usr/bin/xinit,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/Xorg,xorg-x11-drivers,xorg-x11-fonts-Type1,metacity,@hardware-support
|
|
|
ffd6ed |
cat > $tmpdir/p2v.conf <<'EOF'
|
|
|
ffd6ed |
add_drivers+=" usb-storage "
|
|
|
ffd6ed |
EOF
|
|
|
ffd6ed |
@@ -117,13 +117,13 @@ EOF
|
|
|
ffd6ed |
"
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
debian-*|ubuntu-*)
|
|
|
ffd6ed |
- deps=libpcre3,libxml2,libgtk2.0-0,openssh-client,qemu-utils,xorg,xserver-xorg-video-all,matchbox-window-manager
|
|
|
ffd6ed |
+ deps=libpcre3,libxml2,libgtk2.0-0,openssh-client,qemu-utils,xorg,xserver-xorg-video-all,metacity
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
archlinux-*)
|
|
|
ffd6ed |
- deps=pcre,libxml2,gtk2,openssh,qemu,xorg-xinit,xorg-server,xf86-video-*,matchbox-window-manager
|
|
|
ffd6ed |
+ deps=pcre,libxml2,gtk2,openssh,qemu,xorg-xinit,xorg-server,xf86-video-*,metacity
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
opensuse-*|suse-*)
|
|
|
ffd6ed |
- deps=pcre,libxml2,gtk2,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/xinit,/usr/bin/Xorg,xf86-video-*,matchbox-window-manager
|
|
|
ffd6ed |
+ deps=pcre,libxml2,gtk2,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/xinit,/usr/bin/Xorg,xf86-video-*,metacity
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
*)
|
|
|
ffd6ed |
echo "$program: internal error: could not work out the Linux distro from '$osversion'"
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|