From 17fa83b8c262958a1cd8779d77f97895d4e64165 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 28 Jun 2016 16:43:40 +0100
Subject: [PATCH] p2v: Add more utilities to the virt-p2v ISO.

- iscsi-initiator-utils (open-iscsi), as a partial fix for RHBZ#1337052

- vi (Vim), to use as an editor inside the XTerm window.

(cherry picked from commit b221863f220ee3bb7aea986a17660f2d1f62ec76)
---
 p2v/dependencies.m4 | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/p2v/dependencies.m4 b/p2v/dependencies.m4
index 6acae8c..d339b2f 100644
--- a/p2v/dependencies.m4
+++ b/p2v/dependencies.m4
@@ -33,6 +33,10 @@ ifelse(REDHAT,1,
   util-linux
   xterm
 
+  dnl Generally useful tools to use within xterm
+  less
+  vim-minimal
+
   dnl The hwdata package contains PCI IDs, used by virt-p2v to display
   dnl network vendor information (RHBZ#855059).
   hwdata
@@ -41,7 +45,7 @@ ifelse(REDHAT,1,
   pciutils
   hdparm
   smartmontools
-  less
+  iscsi-initiator-utils
 
   dnl X11 environment
   /usr/bin/xinit
@@ -75,11 +79,13 @@ ifelse(DEBIAN,1,
   ethtool
   util-linux
   xterm
+  less
+  vim-tiny
   hwdata
   pciutils
   hdparm
   smartmontools
-  less
+  open-iscsi
   xorg
   xserver-xorg-video-all
   fonts-dejavu
@@ -101,11 +107,13 @@ ifelse(ARCHLINUX,1,
   ethtool
   util-linux
   xterm
+  less
+  vim-tiny
   hwdata
   pciutils
   hdparm
   smartmontools
-  less
+  open-iscsi
   xorg-xinit
   xorg-server
   xf86-video-*
@@ -128,11 +136,13 @@ ifelse(SUSE,1,
   ethtool
   util-linux
   xterm
+  less
+  vim
   hwdata
   pciutils
   hdparm
   smartmontools
-  less
+  open-iscsi
   xinit
   xorg-x11-server
   xf86-video-*
-- 
1.8.3.1