From b689cb03b3d6ab520e58592022f78b4318d69279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 8 Oct 2014 13:20:20 +0200 Subject: [PATCH] fedora: use template-builder's yum.conf when installing 3rd party pkgs Otherwise VM-specific config entries would be used, which would not work inside chroot (namely - proxy settings). --- scripts_fedora/add_3rd_party_software.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts_fedora/add_3rd_party_software.sh b/scripts_fedora/add_3rd_party_software.sh index b2dc157..bf27cea 100755 --- a/scripts_fedora/add_3rd_party_software.sh +++ b/scripts_fedora/add_3rd_party_software.sh @@ -7,5 +7,5 @@ if [ "$TEMPLATE_FLAVOR" == "fullyloaded" ]; then rpm --import --root=$INSTALLDIR mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR flash-plugin || exit 1 else - yum-config-manager --installroot=$INSTALLDIR --disable adobe-linux-x86_64 > /dev/null + yum-config-manager -c $PWD/yum.conf --installroot=$INSTALLDIR --disable adobe-linux-x86_64 > /dev/null fi