From e464b25ac1e4d6b3182ee9505ad3372d4a33865e Mon Sep 17 00:00:00 2001 From: Seth Chisamore Date: Wed, 28 Aug 2013 15:56:18 -0400 Subject: [PATCH 1/2] [BENTO-13] ensure `kudzu` is uninstalled on CentOS boxes By default Vagrant uses a DNS proxy in it's NAT networking mode. This effectively shields the guest VM from DNS changes on the host. It also has the nice side effect of nuking hard coded `nameserver` values left over in `/etc/resolv.conf` from base box authoring time. The `kudzu` autoconfig service blocks this behavior though and does not allow `/sbin/dhclient-script` to add the DNS proxy server value to `/etc/resolv.conf`. SIDE COMMENTARY - `kudzu` is a POS and was removed in CentOS 6+. --- definitions/.centos/cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/.centos/cleanup.sh b/definitions/.centos/cleanup.sh index 922c3d6b5..19e473a9f 100644 --- a/definitions/.centos/cleanup.sh +++ b/definitions/.centos/cleanup.sh @@ -1,5 +1,5 @@ #!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts +yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts kudzu yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm From eb6614b1071d4cd4d117af3b31aae8ca33c6dd12 Mon Sep 17 00:00:00 2001 From: Seth Chisamore Date: Wed, 28 Aug 2013 17:43:27 -0400 Subject: [PATCH 2/2] CentOS 5.9 cleanup.sh scripts should be symlink to .centos/cleanup.sh --- definitions/centos-5.9-i386/cleanup.sh | 6 +----- definitions/centos-5.9/cleanup.sh | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) mode change 100644 => 120000 definitions/centos-5.9-i386/cleanup.sh mode change 100644 => 120000 definitions/centos-5.9/cleanup.sh diff --git a/definitions/centos-5.9-i386/cleanup.sh b/definitions/centos-5.9-i386/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-5.9-i386/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-5.9-i386/cleanup.sh b/definitions/centos-5.9-i386/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-5.9-i386/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file diff --git a/definitions/centos-5.9/cleanup.sh b/definitions/centos-5.9/cleanup.sh deleted file mode 100644 index 922c3d6b5..000000000 --- a/definitions/centos-5.9/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-5.9/cleanup.sh b/definitions/centos-5.9/cleanup.sh new file mode 120000 index 000000000..4658a8585 --- /dev/null +++ b/definitions/centos-5.9/cleanup.sh @@ -0,0 +1 @@ +../.centos/cleanup.sh \ No newline at end of file