From 8a804d10e527085c2af31f79807afa2880079a9c Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 3 Sep 2014 17:43:01 -0700
Subject: [PATCH] Add more tools for rescue mode (#1109785)

This adds od, hexdump, hexedit, gdisk, and binaries from sg3_utils

Resolves: rhbz#1109785
---
 share/runtime-cleanup.tmpl | 4 ++--
 share/runtime-install.tmpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index e92ac59b..452bebed 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -147,7 +147,7 @@ removefrom coreutils /usr/bin/expand /usr/bin/factor
 removefrom coreutils /usr/bin/fold /usr/bin/groups /usr/bin/hostid
 removefrom coreutils /usr/bin/install /usr/bin/join /usr/bin/logname
 removefrom coreutils /usr/bin/mkfifo /usr/bin/nl /usr/bin/nohup /usr/bin/nproc
-removefrom coreutils /usr/bin/od /usr/bin/paste /usr/bin/pathchk
+removefrom coreutils /usr/bin/paste /usr/bin/pathchk
 removefrom coreutils /usr/bin/pinky /usr/bin/pr /usr/bin/printenv
 removefrom coreutils /usr/bin/printf /usr/bin/ptx /usr/bin/runcon
 removefrom coreutils /usr/bin/sha224sum /usr/bin/sha384sum
@@ -317,7 +317,7 @@ removefrom util-linux --allbut \
     /etc/mtab /etc/pam.d/login /etc/pam.d/remote \
     /usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup} \
     /usr/sbin/{mkswap,nologin,sfdisk,swapoff,swapon,wipefs,partx} \
-    /usr/bin/logger
+    /usr/bin/{logger,hexdump}
 removefrom volume_key-libs /usr/share/locale/*
 removefrom wget /etc/* /usr/share/locale/*
 removefrom xorg-x11-drv-intel /usr/${libdir}/libI*
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index a2877444..f0a1e323 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -151,7 +151,7 @@ installpkg fpaste
 installpkg vim-minimal strace lsof dump xz less eject
 installpkg wget rsync rsh bind-utils ftp mtr vconfig
 installpkg icfg spice-vdagent
-installpkg gdisk
+installpkg gdisk hexedit sg3_utils
 
 ## yum plugins
 installpkg yum-plugin-fastestmirror yum-langpacks