CentOS 6 annoys me.

phase2 · Aug 25, 2011 · 4105806 · 4105806
1 parent 078ac35
commit 4105806
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 20 deletions.
diff --git a/definitions/CentOS-6.0-x86_64-netboot/definition.rb b/definitions/CentOS-6.0-x86_64-netboot/definition.rb
@@ -6,7 +6,7 @@
   :iso_src => "http://be.mirror.eurid.eu/centos/6.0/isos/x86_64/CentOS-6.0-x86_64-netinstall.iso",
   :iso_md5 => "d13da95c29e585ee15cf403b89468243",
   :iso_download_timeout => 1000,
-  :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
+  :boot_wait => "10", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
   :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
   :ssh_login_timeout => "100", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
   :ssh_host_port => "7222", :ssh_guest_port => "22",

diff --git a/definitions/CentOS-6.0-x86_64-netboot/ks.cfg b/definitions/CentOS-6.0-x86_64-netboot/ks.cfg
@@ -1,13 +1,14 @@
 install
-url --url=http://be.mirror.eurid.eu/centos/6.0/os/x86_64/
+#url --url=http://be.mirror.eurid.eu/centos/6.0/os/x86_64/
+url --url=http://192.168.215.20/centos/6.0/os/x86_64/
 lang en_US.UTF-8
 keyboard us
 network --bootproto dhcp
 rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
 firewall --enabled --trust eth0 --ssh
 authconfig --enableshadow --enablemd5
 selinux --disabled
-timezone Europe/Brussels
+timezone America/New_York
 bootloader --location=mbr
 
 text
@@ -22,30 +23,55 @@ firstboot --disabled
 reboot
 
 repo --name=epel --baseurl=http://download.fedora.redhat.com/pub/epel/6/x86_64/ --includepkgs='ruby-augeas,ruby-shadow'
-repo --name=puppetlabs --baseurl=http://stahnma.fedorapeople.org/puppetlabs/6/x86_64 --includepkgs='puppet,facter'
+# repo --name=puppetlabs --baseurl=http://stahnma.fedorapeople.org/puppetlabs/6/x86_64 --includepkgs='puppet,facter'
 
-%packages
-@ core
-ruby
-ruby-devel
-rubygems
-kernel-devel
+%packages --nobase
+coreutils
+findutils
+sudo
+sed
+yum
+rpm
+which
+e2fsprogs
+lvm2
+grub
+sysstat
+ntp
+curl
+wget
+patch
+openssh-server
+openssh-clients
+xorg-x11-xauth
 gcc
-gcc-c++
 bzip2
 make
+gcc-c++
 zlib-devel
 openssl-devel
 readline-devel
+man
+# New in 6.0.
+ruby
+ruby-devel
+rubygems
+kernel-devel
 sqlite-devel
-puppet
-facter
-
+perl
+#puppet
+#facter
+-dhcpv6-client
+-iptables-ipv6
+-rhpl
+# New exclusions for 6.0.
 -ipw2100-firmware
 -ipw2200-firmware
 -ivtv-firmware
 
 %post
+# The installer apparently does not respect 'selinux' in a kickstart. Instead, we sed that shit.
+/bin/sed -i -e 's/\(^SELINUX=\)enforcing$/\1disabled/' /etc/selinux/config
 /usr/sbin/groupadd vagrant
 /usr/sbin/useradd vagrant -g vagrant -G wheel
 echo "vagrant"|passwd --stdin vagrant

diff --git a/definitions/CentOS-6.0-x86_64-netboot/postinstall.sh b/definitions/CentOS-6.0-x86_64-netboot/postinstall.sh
@@ -2,10 +2,12 @@
 
 date > /etc/vagrant_box_build_time
 
-yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
-yum -y clean all
+#yum -y erase wireless-tools gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+#yum -y clean all
 
-gem install --no-ri --no-rdoc chef
+# Sorry, Chef.
+#gem install --no-ri --no-rdoc chef
+gem install --no-ri --no-rdoc puppet
 
 # Installing vagrant keys
 mkdir /home/vagrant/.ssh
@@ -17,14 +19,26 @@ chown -R vagrant /home/vagrant/.ssh
 # Installing the virtualbox guest additions
 VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
 cd /tmp
-wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
+wget http://192.168.215.20/centos/VBoxGuestAdditions_$VBOX_VERSION.iso
+#wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
 mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
 sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
-rm VBoxGuestAdditions_$VBOX_VERSION.iso
+shred --remove --zero --iterations=1 VBoxGuestAdditions_$VBOX_VERSION.iso
+#rm VBoxGuestAdditions_$VBOX_VERSION.iso
 
 sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
 
-dd if=/dev/zero of=/tmp/clean || rm /tmp/clean
+# Kill us some udev crap.
+ln -sf /dev/null /lib/udev/rules.d/75-persistent-net-generator.rules
+rm -f /etc/udev/rules.d/70-persistent-net.rules
+
+# On startup, remove HWADDR from the eth0 interface.
+echo >> /etc/rc.local
+echo 'cp -f /etc/sysconfig/network-scripts/ifcfg-eth0 /tmp/eth0' >> /etc/rc.local
+echo 'sed "/^HWADDR/d" /tmp/eth0 > /etc/sysconfig/network-scripts/ifcfg-eth0' >> /etc/rc.local
+
+# Aha - added shredding.
+# dd if=/dev/zero of=/tmp/clean || rm /tmp/clean
 
 exit