Merge remote-tracking branch 'upstream/wheezy' into wheezy

10 years ago · 7e4148a3b9
parent 4ad8522455 6931ad9457
commit 7e4148a3b9
1 changed files with 1 additions and 1 deletions
--- 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