This looks like a nice improvement. It gets us closer to being out of
the business of managing time zone data. 410 KB does not sound like a
huge hit, but I could be wrong. However, I think including the tzdata
as-is from the distribution is better than maintaining our own subset to
include in the image.
+1
Radek Vykydal wrote:
Up to now, some valid timezones (zonetab is the reference module)
were missing in stage2, which could cause wrong settig of system time
of install environment in case of hwclock being in localtime.
They are added in the patch while some unused stuff is removed:
1) TIMEZONE variable for specifiyng zoneinfo files from tzdata
to be included in stage2 is removed. Instead of keeping it up-to-date
with zonetab module which would be difficult to do automatically,
whole /usr/share/zoneinfo tree is included which increases size
of stage 2 by about 410 KB.
2) /usr/lib/timezones.gz file is no more generated. The file
contained list of zoneinfo files present in stage2 and had been used
to get list of zones for ui which was replaced with zonetab module.
Hope it is not used anywhere outside anaconda.
---
scripts/upd-instroot | 38 +-------------------------------------
1 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 097df60..95d9a54 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -68,9 +68,6 @@ expandPackageSet() {
[ -d $PKGDEST ] || die "ERROR: directory missing: $PKGDEST"
for n in $RPMS; do
[ -n "$DEBUG" ] && echo -e "\rExpanding packages..." $(basename $n)
- if [ "$(rpm --nosignature --nodigest -qp --qf '%{NAME}' $n)" = "tzdata" ] ; then
- TZDATA=$n
- fi
rpm2cpio $n | (cd $PKGDEST; cpio -E $KEEPFILES --quiet -iumd)
[ -n "$DEBUG" ] && echo -e "\rExpanding packages..." "$(basename $n | sed 's/./ /g')"
done
@@ -833,26 +830,9 @@ usr/share/terminfo/v/vt320-w
usr/share/themes/Clearlooks/gtk-2.0/*
usr/share/themes/Clearlooks/index.theme
usr/share/vte/termcap/xterm
-usr/share/zoneinfo/zone.tab
+usr/share/zoneinfo
EOF
-TIMEZONES="
-usr/share/zoneinfo/Africa
-usr/share/zoneinfo/America
-usr/share/zoneinfo/Antarctica
-usr/share/zoneinfo/Arctic
-usr/share/zoneinfo/Asia
-usr/share/zoneinfo/Atlantic
-usr/share/zoneinfo/Australia
-usr/share/zoneinfo/Canada
-usr/share/zoneinfo/Europe
-usr/share/zoneinfo/Indian
-usr/share/zoneinfo/Japan
-usr/share/zoneinfo/Mideast
-usr/share/zoneinfo/Pacific
-usr/share/zoneinfo/US
-"
-
# more dogtail stuff...
cat >> $KEEPFILEGR <<EOF
usr/$LIBDIR/gtk-2.0/modules/libatk-bridge.so
@@ -1003,14 +983,6 @@ expandPackageSet "$RPMS" $DEST $KEEPFILE
echo "Expanding graphical packages..."
expandPackageSet "$RPMSGR" $DESTGR $KEEPFILEGR
-echo "retrieving timezones"
-TZDIR=/tmp/glibc-timezone-$$
-mkdir -p $TZDIR/usr/share/zoneinfo
-rpm2cpio $TZDATA | (cd $TZDIR; cpio --quiet -iumd usr/share/zoneinfo ./usr/share/zoneinfo ./usr/share/zoneinfo/* usr/share/zoneinfo/*)
-[ $? = 0 ] || die "ERROR: Unable to expand timezone data ($TZDATA)"
-(cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DEST; tar xSpf -)
-(cd $TZDIR; tar cSpf - $TIMEZONES) | (cd $DESTGR; tar xSpf -)
-
chown -R root:root $DEST $DESTGR
chmod -R a+rX-w $DEST $DESTGR
if [ $ARCH = s390 -o $ARCH = s390x ]; then
@@ -1281,14 +1253,6 @@ for p in $DEST $DESTGR; do
(cd $p/lib* && rm -f libnss_files.so.1 libnss_dns.so.1)
fi
- if [ -d $DEST/usr/share/zoneinfo ]; then
- (cd $DEST/usr/share/zoneinfo; find . -type f -or -type l |
- grep '^./[A-Z]' | sort | sed 's/^..//' |
- gzip -9) > $p/usr/lib/timezones.gz
- else
- echo "ERROR: unable to explode tzdata for small images"
- fi
-
$p/usr/lib/anaconda-runtime/scrubtree $p
done
--
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
