|
 |
ffd6ed |
From e7431385cbd6a5f5dc5d5b38e25014c8d15842dd Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
ffd6ed |
Date: Tue, 19 May 2015 16:37:22 +0100
|
|
|
ffd6ed |
Subject: [PATCH] p2v: Explicitly depend on nm-connection-editor.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
Previously it was only being pulled in implicitly. However virt-p2v
|
|
|
ffd6ed |
runs this binary from the "Configure Network" button.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
This fixes commit e464774a79ff9eeedcdb3fd53efd5a7898ca036e.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
(cherry picked from commit f6dd8a3221cfa7b5aa6434cddcd0d636dd64e02b)
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
p2v/p2v.ks.in | 1 +
|
|
|
ffd6ed |
p2v/virt-p2v-make-disk.in | 9 +++++----
|
|
|
ffd6ed |
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/p2v/p2v.ks.in b/p2v/p2v.ks.in
|
|
|
ffd6ed |
index 2319781..58cca5e 100644
|
|
|
ffd6ed |
--- a/p2v/p2v.ks.in
|
|
|
ffd6ed |
+++ b/p2v/p2v.ks.in
|
|
|
ffd6ed |
@@ -70,6 +70,7 @@ metacity
|
|
|
ffd6ed |
pcre
|
|
|
ffd6ed |
libxml2
|
|
|
ffd6ed |
gtk2
|
|
|
ffd6ed |
+nm-connection-editor
|
|
|
ffd6ed |
network-manager-applet
|
|
|
ffd6ed |
dbus-x11
|
|
|
ffd6ed |
hwdata
|
|
|
ffd6ed |
diff --git a/p2v/virt-p2v-make-disk.in b/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
index 6d7dcb2..28d6e75 100644
|
|
|
ffd6ed |
--- a/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
+++ b/p2v/virt-p2v-make-disk.in
|
|
|
ffd6ed |
@@ -96,13 +96,14 @@ trap cleanup INT QUIT TERM EXIT ERR
|
|
|
ffd6ed |
# - hardware support (firmware etc, RHBZ#1157679)
|
|
|
ffd6ed |
# - metacity (window manager, another could be used)
|
|
|
ffd6ed |
# - NetworkManager
|
|
|
ffd6ed |
+# - nm-connection-editor
|
|
|
ffd6ed |
# - nm-applet
|
|
|
ffd6ed |
# - dbus-x11 (required by nm-applet, but not specified as a dep in Fedora)
|
|
|
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,metacity,NetworkManager,network-manager-applet,dbus-x11,hwdata,@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,NetworkManager,nm-connection-editor,network-manager-applet,dbus-x11,hwdata,@hardware-support
|
|
|
ffd6ed |
cat > $tmpdir/p2v.conf <<'EOF'
|
|
|
ffd6ed |
add_drivers+=" usb-storage "
|
|
|
ffd6ed |
EOF
|
|
|
ffd6ed |
@@ -120,13 +121,13 @@ EOF
|
|
|
ffd6ed |
"
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
debian-*|ubuntu-*)
|
|
|
ffd6ed |
- deps=libpcre3,libxml2,libgtk2.0-0,openssh-client,qemu-utils,xorg,xserver-xorg-video-all,metacity,network-manager,network-manager-applet,dbus-x11,hwdata
|
|
|
ffd6ed |
+ deps=libpcre3,libxml2,libgtk2.0-0,openssh-client,qemu-utils,xorg,xserver-xorg-video-all,metacity,network-manager,network-manager-gnome,network-manager-applet,dbus-x11,hwdata
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
archlinux-*)
|
|
|
ffd6ed |
- deps=pcre,libxml2,gtk2,openssh,qemu,xorg-xinit,xorg-server,xf86-video-*,metacity,NetworkManager,network-manager-applet,dbus-x11,hwdata
|
|
|
ffd6ed |
+ deps=pcre,libxml2,gtk2,openssh,qemu,xorg-xinit,xorg-server,xf86-video-*,metacity,NetworkManager,nm-connection-editor,network-manager-applet,dbus-x11,hwdata
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
opensuse-*|suse-*)
|
|
|
ffd6ed |
- deps=pcre,libxml2,gtk2,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/xinit,/usr/bin/Xorg,xf86-video-*,metacity,NetworkManager,network-manager-applet,dbus-x11,hwdata
|
|
|
ffd6ed |
+ deps=pcre,libxml2,gtk2,/usr/bin/ssh,/usr/bin/qemu-nbd,/usr/bin/xinit,/usr/bin/Xorg,xf86-video-*,metacity,NetworkManager,nm-connection-editor,network-manager-applet,dbus-x11,hwdata
|
|
|
ffd6ed |
;;
|
|
|
ffd6ed |
*)
|
|
|
ffd6ed |
echo "$program: internal error: could not work out the Linux distro from '$osversion'"
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|