From fa73086cf12bef329e49f6c6fc86d9dc74db7173 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 24 Nov 2016 11:15:39 +0100 Subject: [PATCH] Don't hack 'override_install_langs' yum option This shouldn't be needed, re-defining %_install_langs should be enough. --- fedora-cloud-base.ks | 3 --- fedora-docker-base.ks | 13 +------------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 6cdd70d..da6900c 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -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 build-locale-archive 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" diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index 1c7545f..c76111a 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -53,18 +53,7 @@ set -e userdel -r none LANG="en_US" -echo "%_install_lang $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 "%_install_langs $LANG" > /etc/rpm/macros.image-language-conf echo "Import RPM GPG key" releasever=$(rpm -q --qf '%{version}\n' fedora-release)