Merge "yum-minimal: set locale.conf and tz in chroot"
This commit is contained in:
commit
e884309272
@ -151,8 +151,8 @@ function _install_pkg_manager {
|
|||||||
# uses to get the minimal-langpack and chooses a
|
# uses to get the minimal-langpack and chooses a
|
||||||
# random(ish) one that satisfies the locale dependency
|
# random(ish) one that satisfies the locale dependency
|
||||||
# (rhbz#1349258). Work-around this by explicitly requring
|
# (rhbz#1349258). Work-around this by explicitly requring
|
||||||
# the minimal pack.
|
# the minimal and english (for en_US.UTF-8) pack.
|
||||||
_lang_pack="glibc-minimal-langpack"
|
_lang_pack="glibc-minimal-langpack glibc-langpack-en"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo -E yum -y \
|
sudo -E yum -y \
|
||||||
@ -241,6 +241,13 @@ else
|
|||||||
echo -e "# This file intentionally left blank\n" | \
|
echo -e "# This file intentionally left blank\n" | \
|
||||||
sudo tee $TARGET_ROOT/etc/resolv.conf
|
sudo tee $TARGET_ROOT/etc/resolv.conf
|
||||||
|
|
||||||
|
# set the most reliable UTF-8 locale
|
||||||
|
echo -e 'LANG="en_US.UTF-8"' | \
|
||||||
|
sudo tee $TARGET_ROOT/etc/locale.conf
|
||||||
|
# default to UTC
|
||||||
|
sudo -E chroot $TARGET_ROOT ln -sf /usr/share/zoneinfo/UTC \
|
||||||
|
/etc/localtime
|
||||||
|
|
||||||
# cleanup
|
# cleanup
|
||||||
# TODO : move this into a exit trap; and reconsider how
|
# TODO : move this into a exit trap; and reconsider how
|
||||||
# this integrates with the global exit cleanup path.
|
# this integrates with the global exit cleanup path.
|
||||||
|
Loading…
Reference in New Issue
Block a user