[Pkg-libvirt-commits] [libguestfs] 02/11: p2v: Use matchbox (window manager) in the virt-p2v ISO.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.41-1
in repository libguestfs.

commit 4fc333d0eff19e82b6f41957af091ecf4806670e
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Sep 8 13:13:01 2014 +0100

    p2v: Use matchbox (window manager) in the virt-p2v ISO.
    
    virt-p2v can run without a window manager.  However it then sits in
    the top left corner of the screen.  Add a lightweight window manager
    to the ISO so that position and geometry hints work.
---
 p2v/launch-virt-p2v.in    | 11 +++++++++--
 p2v/p2v.ks.in             |  1 +
 p2v/virt-p2v-make-disk.in |  9 +++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/p2v/launch-virt-p2v.in b/p2v/launch-virt-p2v.in
index 36a4502..a70e5c2 100755
--- a/p2v/launch-virt-p2v.in
+++ b/p2v/launch-virt-p2v.in
@@ -18,5 +18,12 @@
 
 # This normally runs from systemd which deals with logging.
 
-cd /
-xinit @libexecdir@/virt-p2v
+# To save one script, invoke self again to run the window manager
+# and virt-p2v.
+if [ "$1" = "run" ]; then
+    cd /
+    matchbox-window-manager &
+    exec @libexecdir@/virt-p2v
+else
+    xinit "$0" run
+fi
diff --git a/p2v/p2v.ks.in b/p2v/p2v.ks.in
index 6074438..3019c4e 100644
--- a/p2v/p2v.ks.in
+++ b/p2v/p2v.ks.in
@@ -60,6 +60,7 @@ kernel
 /usr/bin/Xorg
 xorg-x11-drivers
 xorg-x11-fonts-Type1
+matchbox-window-manager
 pcre
 libxml2
 gtk2
diff --git a/p2v/virt-p2v-make-disk.in b/p2v/virt-p2v-make-disk.in
index f057746..af1d6f4 100644
--- a/p2v/virt-p2v-make-disk.in
+++ b/p2v/virt-p2v-make-disk.in
@@ -85,21 +85,22 @@ osversion="$1"
 #   - Xorg (or another X server, but only Xorg has been tested)
 #   - Xorg drivers
 #   - some fonts
+#   - matchbox (window manager, another could be used)
 #
 # Note that libguestfs is NOT a dependency.
 case "$osversion" in
     centos-*|fedora-*|rhel-*|scientificlinux-*)
-        deps=pcre,libxml2,gtk2,/usr/bin/xinit,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/Xorg,xorg-x11-drivers,xorg-x11-fonts-Type1
+        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
         selinux_relabel=--selinux-relabel
         ;;
     debian-*|ubuntu-*)
-        deps=libpcre3,libxml2,libgtk2.0-0,openssh-client,qemu-utils,xorg,xserver-xorg-video-all
+        deps=libpcre3,libxml2,libgtk2.0-0,openssh-client,qemu-utils,xorg,xserver-xorg-video-all,matchbox-window-manager
         ;;
     archlinux-*)
-        deps=pcre,libxml2,gtk2,openssh,qemu,xorg-xinit,xorg-server,xf86-video-*
+        deps=pcre,libxml2,gtk2,openssh,qemu,xorg-xinit,xorg-server,xf86-video-*,matchbox-window-manager
         ;;
     opensuse-*|suse-*)
-        deps=pcre,libxml2,gtk2,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/xinit,/usr/bin/Xorg,xf86-video-*
+        deps=pcre,libxml2,gtk2,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/xinit,/usr/bin/Xorg,xf86-video-*,matchbox-window-manager
         ;;
     *)
         echo "$program: internal error: could not work out the Linux distro from '$osversion'"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git