From 634ddcb7647aed0fbf4a05cbd293f90e52f73742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 2 Jul 2014 01:05:21 +0200 Subject: [PATCH] fedora: disable adobe repo in default template (#828) --- scripts_fedora/add_3rd_party_software.sh | 8 ++++++-- scripts_fedora/packages_fc20_default.list | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 scripts_fedora/packages_fc20_default.list diff --git a/scripts_fedora/add_3rd_party_software.sh b/scripts_fedora/add_3rd_party_software.sh index fce6757..b2dc157 100755 --- a/scripts_fedora/add_3rd_party_software.sh +++ b/scripts_fedora/add_3rd_party_software.sh @@ -3,5 +3,9 @@ INSTALLDIR=$PWD/mnt rpm -i --root=$INSTALLDIR $SCRIPTSDIR/3rd_party_software/adobe-release-x86_64-*.noarch.rpm || exit 1 -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 +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 +fi diff --git a/scripts_fedora/packages_fc20_default.list b/scripts_fedora/packages_fc20_default.list new file mode 120000 index 0000000..852ead1 --- /dev/null +++ b/scripts_fedora/packages_fc20_default.list @@ -0,0 +1 @@ +packages_fc20.list \ No newline at end of file