|
 |
e76f14 |
From 17fa83b8c262958a1cd8779d77f97895d4e64165 Mon Sep 17 00:00:00 2001
|
|
|
e76f14 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
e76f14 |
Date: Tue, 28 Jun 2016 16:43:40 +0100
|
|
|
e76f14 |
Subject: [PATCH] p2v: Add more utilities to the virt-p2v ISO.
|
|
|
e76f14 |
|
|
|
e76f14 |
- iscsi-initiator-utils (open-iscsi), as a partial fix for RHBZ#1337052
|
|
|
e76f14 |
|
|
|
e76f14 |
- vi (Vim), to use as an editor inside the XTerm window.
|
|
|
e76f14 |
|
|
|
e76f14 |
(cherry picked from commit b221863f220ee3bb7aea986a17660f2d1f62ec76)
|
|
|
e76f14 |
---
|
|
|
e76f14 |
p2v/dependencies.m4 | 18 ++++++++++++++----
|
|
|
e76f14 |
1 file changed, 14 insertions(+), 4 deletions(-)
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/p2v/dependencies.m4 b/p2v/dependencies.m4
|
|
|
e76f14 |
index 6acae8c..d339b2f 100644
|
|
|
e76f14 |
--- a/p2v/dependencies.m4
|
|
|
e76f14 |
+++ b/p2v/dependencies.m4
|
|
|
e76f14 |
@@ -33,6 +33,10 @@ ifelse(REDHAT,1,
|
|
|
e76f14 |
util-linux
|
|
|
e76f14 |
xterm
|
|
|
e76f14 |
|
|
|
e76f14 |
+ dnl Generally useful tools to use within xterm
|
|
|
e76f14 |
+ less
|
|
|
e76f14 |
+ vim-minimal
|
|
|
e76f14 |
+
|
|
|
e76f14 |
dnl The hwdata package contains PCI IDs, used by virt-p2v to display
|
|
|
e76f14 |
dnl network vendor information (RHBZ#855059).
|
|
|
e76f14 |
hwdata
|
|
|
e76f14 |
@@ -41,7 +45,7 @@ ifelse(REDHAT,1,
|
|
|
e76f14 |
pciutils
|
|
|
e76f14 |
hdparm
|
|
|
e76f14 |
smartmontools
|
|
|
e76f14 |
- less
|
|
|
e76f14 |
+ iscsi-initiator-utils
|
|
|
e76f14 |
|
|
|
e76f14 |
dnl X11 environment
|
|
|
e76f14 |
/usr/bin/xinit
|
|
|
e76f14 |
@@ -75,11 +79,13 @@ ifelse(DEBIAN,1,
|
|
|
e76f14 |
ethtool
|
|
|
e76f14 |
util-linux
|
|
|
e76f14 |
xterm
|
|
|
e76f14 |
+ less
|
|
|
e76f14 |
+ vim-tiny
|
|
|
e76f14 |
hwdata
|
|
|
e76f14 |
pciutils
|
|
|
e76f14 |
hdparm
|
|
|
e76f14 |
smartmontools
|
|
|
e76f14 |
- less
|
|
|
e76f14 |
+ open-iscsi
|
|
|
e76f14 |
xorg
|
|
|
e76f14 |
xserver-xorg-video-all
|
|
|
e76f14 |
fonts-dejavu
|
|
|
e76f14 |
@@ -101,11 +107,13 @@ ifelse(ARCHLINUX,1,
|
|
|
e76f14 |
ethtool
|
|
|
e76f14 |
util-linux
|
|
|
e76f14 |
xterm
|
|
|
e76f14 |
+ less
|
|
|
e76f14 |
+ vim-tiny
|
|
|
e76f14 |
hwdata
|
|
|
e76f14 |
pciutils
|
|
|
e76f14 |
hdparm
|
|
|
e76f14 |
smartmontools
|
|
|
e76f14 |
- less
|
|
|
e76f14 |
+ open-iscsi
|
|
|
e76f14 |
xorg-xinit
|
|
|
e76f14 |
xorg-server
|
|
|
e76f14 |
xf86-video-*
|
|
|
e76f14 |
@@ -128,11 +136,13 @@ ifelse(SUSE,1,
|
|
|
e76f14 |
ethtool
|
|
|
e76f14 |
util-linux
|
|
|
e76f14 |
xterm
|
|
|
e76f14 |
+ less
|
|
|
e76f14 |
+ vim
|
|
|
e76f14 |
hwdata
|
|
|
e76f14 |
pciutils
|
|
|
e76f14 |
hdparm
|
|
|
e76f14 |
smartmontools
|
|
|
e76f14 |
- less
|
|
|
e76f14 |
+ open-iscsi
|
|
|
e76f14 |
xinit
|
|
|
e76f14 |
xorg-x11-server
|
|
|
e76f14 |
xf86-video-*
|
|
|
e76f14 |
--
|
|
|
e76f14 |
1.8.3.1
|
|
|
e76f14 |
|