QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Mehring 2014-10-22 05:41:59 -04:00
commit 7e4148a3b9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts_fedora/add_3rd_party_software.sh
View File

@ -7,5 +7,5 @@ if [ "$TEMPLATE_FLAVOR" == "fullyloaded" ]; then
rpm --import --root=$INSTALLDIR mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux 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 yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR flash-plugin || exit 1
else 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 fi