From 3ccd97bfb91621ff0e279d7e4519d7ecedd539ab Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Sat, 4 Oct 2008 17:52:41 -1000
Subject: [PATCH] Merge etc/rescue* contents in to appropriate etc/packages*
 files.

After reading upd-instroot [again], I see that we just merge the
PACKAGES and PACKAGESRESCUE lists together at the end since it's
all the same image now.
---
 etc/packages        | 23 +++++++++++++++++++++++
 etc/packages.i386   |  1 +
 etc/packages.x86_64 |  1 +
 etc/rescue          | 37 -------------------------------------
 etc/rescue.i386     |  2 --
 etc/rescue.x86_64   |  2 --
 6 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100644 etc/rescue
 delete mode 100644 etc/rescue.i386
 delete mode 100644 etc/rescue.x86_64

diff --git a/etc/packages b/etc/packages
index f455915b..d5d52e03 100644
--- a/etc/packages
+++ b/etc/packages
@@ -49,11 +49,14 @@ dmraid
 dmraid-libs
 dogtail
 dosfstools
+dump
 e2fsprogs
 e2fsprogs-libs
 echo-icon-theme
 elfutils-libelf
 expat
+findutils
+firstaidkit-plugin-all
 firstboot
 fontconfig
 fonts-ISO8859-2
@@ -72,6 +75,7 @@ fonts-sinhala
 fonts-tamil
 fonts-telugu
 freetype
+ftp
 gail
 gdk-pixbuf
 gfs2-utils
@@ -86,6 +90,7 @@ gpm
 gtk2
 gtk2-engines
 gtkhtml2
+gzip
 hal
 hdparm
 hwdata
@@ -94,8 +99,10 @@ iproute
 iputils
 iscsi-initiator-utils
 jfsutils
+joe
 keyutils-libs
 krb5-libs
+less
 libICE
 libSM
 libX11
@@ -132,6 +139,7 @@ libgcrypt
 libglade2
 libgnomecanvas
 libgpg-error
+libidn
 libjpeg
 liblbxutil
 libnl
@@ -152,10 +160,15 @@ libxcb
 libxkbfile
 libxml2
 lvm2
+man
 mdadm
 mesa-dri-drivers
 mkinitrd
 module-init-tools
+modutils
+mt-st
+mtools
+mtr
 nash
 ncurses
 neon
@@ -165,6 +178,10 @@ newt-python
 nfs-utils
 nspr
 nss
+ntfsprogs
+open
+openssh
+openssh-clients
 openssl
 pam
 pango
@@ -199,10 +216,14 @@ rhpl
 rpm
 rpm-libs
 rpm-python
+rsh
+rsync
+samba-client
 sed
 selinux-policy-targeted
 setup
 slang
+smartmontools
 specspo
 sqlite
 synaptics
@@ -211,7 +232,9 @@ system-config-keyboard
 system-logos
 system-release
 taipeifonts
+tar
 tcp_wrappers
+traceroute
 ttfonts-bn
 ttfonts-gu
 ttfonts-hi
diff --git a/etc/packages.i386 b/etc/packages.i386
index cb844008..59bda823 100644
--- a/etc/packages.i386
+++ b/etc/packages.i386
@@ -3,6 +3,7 @@
 dmidecode
 efibootmgr
 glibc.i386
+gpart
 grub
 memtest86+
 openssl.i386
diff --git a/etc/packages.x86_64 b/etc/packages.x86_64
index ce2f684c..c70f3df7 100644
--- a/etc/packages.x86_64
+++ b/etc/packages.x86_64
@@ -1,5 +1,6 @@
 dmidecode
 efibootmgr
+gpart
 grub
 memtest86+
 pcmciautils
diff --git a/etc/rescue b/etc/rescue
deleted file mode 100644
index 0a6e469a..00000000
--- a/etc/rescue
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Packages added to the 'packages' + 'packages.ARCH' set to supplement
-# the rescue images.
-#
-
-bzip2
-bzip2-libs
-device-mapper
-device-mapper-libs
-dmraid
-dump
-findutils
-firstaidkit-plugin-all
-ftp
-gzip
-iputils
-joe
-krb5-libs
-less
-libidn
-man
-modutils
-mt-st
-mtools
-mtr
-net-tools
-ntfsprogs
-open
-openssh
-openssh-clients
-pciutils
-rsh
-rsync
-samba-client
-smartmontools
-tar
-traceroute
diff --git a/etc/rescue.i386 b/etc/rescue.i386
deleted file mode 100644
index 3650de10..00000000
--- a/etc/rescue.i386
+++ /dev/null
@@ -1,2 +0,0 @@
-gpart
-grub
diff --git a/etc/rescue.x86_64 b/etc/rescue.x86_64
deleted file mode 100644
index 3650de10..00000000
--- a/etc/rescue.x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-gpart
-grub