From 6ea47a9570c47a318c9942973dd05b3f18f7d0a3 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 1 Sep 2015 15:55:14 -0500 Subject: [PATCH] add tsflags=nodocs to dnf.conf as well as yum.conf --- fedora-docker-base.ks | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fedora-docker-base.ks b/fedora-docker-base.ks index 07d3049..93cfbf5 100644 --- a/fedora-docker-base.ks +++ b/fedora-docker-base.ks @@ -51,10 +51,17 @@ 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 "Import RPM GPG key" releasever=$(rpm -q --qf '%{version}\n' fedora-release) basearch=$(uname -i)