mirror of
https://pagure.io/fedora-kickstarts.git
synced 2024-11-10 08:00:06 +00:00
Don't hack 'override_install_langs' yum option
This shouldn't be needed, re-defining %_install_langs should be enough.
This commit is contained in:
parent
b0f431b85b
commit
fa73086cf1
@ -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"
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user