Skip to content

Commit

Permalink
Update Oracle Linux 7.0 x86_64 template as EPEL 7 has left beta
Browse files Browse the repository at this point in the history
  • Loading branch information
terrywang committed Sep 2, 2014
1 parent 9ff590c commit 5ebb8a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions templates/OracleLinux-7.0-x86_64-DVD/base.sh
Expand Up @@ -5,12 +5,12 @@ source ./proxy.sh
sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers

cd /tmp
wget http://download.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.2.noarch.rpm
rpm -ivh epel-release-7-0.2.noarch.rpm
rm -f epel-release-7-0.2.noarch.rpm
wget http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-1.noarch.rpm
rpm -ivh epel-release-7-1.noarch.rpm
rm -f epel-release-7-1.noarch.rpm
# Not flexible to switch between direct Internet access and behind firewall
# --httpproxy HOST --httpport PORT
# rpm -ivh http://download.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.2.noarch.rpm
# rpm -ivh http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-1.noarch.rpm

echo "UseDNS no" >> /etc/ssh/sshd_config

Expand Down
2 changes: 1 addition & 1 deletion templates/OracleLinux-7.0-x86_64-DVD/provision.sh
Expand Up @@ -5,7 +5,7 @@
echo $(grep PRETTY_NAME /etc/os-release | cut -d'"' -f2)

# EPEL for Enterprise Linux 7 already set in base.sh
# rpm -ivh http://download.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.2.noarch.rpm
# rpm -ivh http://download.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-1.noarch.rpm

# Start provisioning
yum install -y bash bash-completion zsh tmux \
Expand Down

0 comments on commit 5ebb8a0

Please sign in to comment.