[PATCH rhel 5.4] Include zoneinfo subtree in stage2 (#481617).

[Radek Vykydal <rvykydal redhat com>]

I overlooked one place in upd-instroot which should have been modified too, so
/usr/share/zoneinfo tree wasn't actually included in stage2.
Also remove use of variable removed in original patch for the bug.
---
 scripts/upd-instroot |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 5948de4..39fcc0b 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -518,7 +518,7 @@ usr/share/hwdata/videodrivers
 usr/share/hwdata/MonitorsDB
 usr/share/xorg/extramodes
 usr/share/xorg/vesamodes
-usr/share/zoneinfo/zone.tab
+usr/share/zoneinfo
 EOF
 
 if [ $ARCH = s390 -o $ARCH = s390x ]; then
@@ -1332,9 +1332,6 @@ rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/email/test/
 rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/curses/
 rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/pydoc.py
 
-# clean up tzdata
-rm -rf $TZDIR
-
 # this is only for the minimal second stage
 echo "Cleaning ramdisk install images..."
 rm -rf $DEST/usr/lib/anaconda-runtime
-- 
1.5.4.3