bbaassssiiee/fedora-kickstarts
1
0
Fork 0
forked from srbala/fedora-kickstarts
Code Issues Pull Requests Releases Activity

Merge #104 Don't hack 'override_install_langs' yum option

Browse Source
This commit is contained in:
Dennis Gilmore 2016-12-05 22:10:38 +00:00
commit 254794c891
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fedora-cloud-base.ks
View File

@ -163,9 +163,6 @@ localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archiv
mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
build-locale-archive build-locale-archive
echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
< /etc/yum.conf > /etc/yum.conf.new
mv /etc/yum.conf.new /etc/yum.conf
echo -n "Getty fixes" echo -n "Getty fixes"

13
fedora-docker-base.ks
View File

@ -53,18 +53,7 @@ set -e
userdel -r none userdel -r none
LANG="en_US" LANG="en_US"
echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf echo "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf
# Carry these configs for both dnf and yum for users who are calling
# yum-deprecated directly. This will keep the experience between both
# consistent
awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
< /etc/yum.conf > /etc/yum.conf.new
mv /etc/yum.conf.new /etc/yum.conf
awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
< /etc/dnf/dnf.conf > /etc/dnf/dnf.conf.new
mv /etc/dnf/dnf.conf.new /etc/dnf/dnf.conf
echo "Import RPM GPG key" echo "Import RPM GPG key"
releasever=$(rpm -q --qf '%{version}\n' fedora-release) releasever=$(rpm -q --qf '%{version}\n' fedora-release)