From e849ca27e45ff7c108c0e7072feb670e45a57c51 Mon Sep 17 00:00:00 2001 From: Lew Goettner Date: Tue, 21 May 2013 15:05:37 -0400 Subject: [PATCH] [BENTO-46] Update the centos-6.4 definition to use the common components. --- definitions/centos-6.4/chef-client.sh | 3 -- definitions/centos-6.4/cleanup.sh | 6 +--- definitions/centos-6.4/ks.cfg | 40 +-------------------------- definitions/centos-6.4/minimize.sh | 5 +--- definitions/centos-6.4/vagrant.sh | 18 +----------- 5 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 definitions/centos-6.4/chef-client.sh mode change 100644 => 120000 definitions/centos-6.4/cleanup.sh mode change 100644 => 120000 definitions/centos-6.4/ks.cfg mode change 100644 => 120000 definitions/centos-6.4/minimize.sh mode change 100644 => 120000 definitions/centos-6.4/vagrant.sh diff --git a/definitions/centos-6.4/chef-client.sh b/definitions/centos-6.4/chef-client.sh deleted file mode 100644 index f1f28d4d2..000000000 --- a/definitions/centos-6.4/chef-client.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -eux - -wget -O - http://opscode.com/chef/install.sh | sudo bash diff --git a/definitions/centos-6.4/cleanup.sh b/definitions/centos-6.4/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-6.4/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/centos-6.4/cleanup.sh b/definitions/centos-6.4/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-6.4/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-6.4/ks.cfg b/definitions/centos-6.4/ks.cfg deleted file mode 100644 index e00fd5a2a..000000000 --- a/definitions/centos-6.4/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/centos-6.4/ks.cfg b/definitions/centos-6.4/ks.cfg new file mode 120000 index 000000000..24af87031 --- /dev/null +++ b/definitions/centos-6.4/ks.cfg @@ -0,0 +1 @@ +../.centos/ks.cfg \ No newline at end of file diff --git a/definitions/centos-6.4/minimize.sh b/definitions/centos-6.4/minimize.sh deleted file mode 100644 index 3846a1d65..000000000 --- a/definitions/centos-6.4/minimize.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -dd if=/dev/zero of=/EMPTY bs=1M -rm -f /EMPTY diff --git a/definitions/centos-6.4/minimize.sh b/definitions/centos-6.4/minimize.sh new file mode 120000 index 000000000..b3632ccbc --- /dev/null +++ b/definitions/centos-6.4/minimize.sh @@ -0,0 +1 @@ +../.common/minimize.sh \ No newline at end of file diff --git a/definitions/centos-6.4/vagrant.sh b/definitions/centos-6.4/vagrant.sh deleted file mode 100644 index 9368ef636..000000000 --- a/definitions/centos-6.4/vagrant.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -eux - -mkdir /tmp/vbox -VER=$(cat /home/vagrant/.vbox_version) -wget http://download.virtualbox.org/virtualbox/$VER/VBoxGuestAdditions_$VER.iso -mount -o loop VBoxGuestAdditions_$VER.iso /tmp/vbox -sh /tmp/vbox/VBoxLinuxAdditions.run -umount /tmp/vbox -rmdir /tmp/vbox -rm *.iso - -mkdir /home/vagrant/.ssh -wget --no-check-certificate \ - 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' \ - -O /home/vagrant/.ssh/authorized_keys -chown -R vagrant /home/vagrant/.ssh -chmod -R go-rwsx /home/vagrant/.ssh diff --git a/definitions/centos-6.4/vagrant.sh b/definitions/centos-6.4/vagrant.sh new file mode 120000 index 000000000..702949639 --- /dev/null +++ b/definitions/centos-6.4/vagrant.sh @@ -0,0 +1 @@ +../.common/vagrant.sh \ No newline at end of file