|
 |
0d20ef |
From 87979f276677b934e930e2cb78803715635e4496 Mon Sep 17 00:00:00 2001
|
|
|
0d20ef |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
0d20ef |
Date: Mon, 27 Oct 2014 13:41:49 +0000
|
|
|
0d20ef |
Subject: [PATCH] p2v: Add "Hardware Support" group to the P2V images
|
|
|
0d20ef |
(RHBZ#1157679).
|
|
|
0d20ef |
|
|
|
0d20ef |
Thanks: Chris Adams
|
|
|
0d20ef |
(cherry picked from commit 91788cd76f23227c102293a5dc5eef1c30cf7858)
|
|
|
0d20ef |
---
|
|
|
0d20ef |
p2v/p2v.ks.in | 1 +
|
|
|
0d20ef |
p2v/virt-p2v-make-disk.in | 3 ++-
|
|
|
0d20ef |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/p2v/p2v.ks.in b/p2v/p2v.ks.in
|
|
|
0d20ef |
index 3019c4e..c21424f 100644
|
|
|
0d20ef |
--- a/p2v/p2v.ks.in
|
|
|
0d20ef |
+++ b/p2v/p2v.ks.in
|
|
|
0d20ef |
@@ -64,6 +64,7 @@ matchbox-window-manager
|
|
|
0d20ef |
pcre
|
|
|
0d20ef |
libxml2
|
|
|
0d20ef |
gtk2
|
|
|
0d20ef |
+@hardware-support --optional
|
|
|
0d20ef |
|
|
|
0d20ef |
%end
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/p2v/virt-p2v-make-disk.in b/p2v/virt-p2v-make-disk.in
|
|
|
0d20ef |
index af1d6f4..c29af2c 100644
|
|
|
0d20ef |
--- a/p2v/virt-p2v-make-disk.in
|
|
|
0d20ef |
+++ b/p2v/virt-p2v-make-disk.in
|
|
|
0d20ef |
@@ -85,12 +85,13 @@ osversion="$1"
|
|
|
0d20ef |
# - Xorg (or another X server, but only Xorg has been tested)
|
|
|
0d20ef |
# - Xorg drivers
|
|
|
0d20ef |
# - some fonts
|
|
|
0d20ef |
+# - hardware support (firmware etc, RHBZ#1157679)
|
|
|
0d20ef |
# - matchbox (window manager, another could be used)
|
|
|
0d20ef |
#
|
|
|
0d20ef |
# Note that libguestfs is NOT a dependency.
|
|
|
0d20ef |
case "$osversion" in
|
|
|
0d20ef |
centos-*|fedora-*|rhel-*|scientificlinux-*)
|
|
|
0d20ef |
- 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
|
|
|
0d20ef |
+ 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
|
|
|
0d20ef |
selinux_relabel=--selinux-relabel
|
|
|
0d20ef |
;;
|
|
|
0d20ef |
debian-*|ubuntu-*)
|
|
|
0d20ef |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|