From d0697cee50c2e31c25fd1b64566c30147cb32040 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 Nov 2013 21:52:46 -0500 Subject: [PATCH 1/5] Fix BENTO-94 in CentOS/RHEL by disabling fingerprint PAM module in cleanup.sh --- packer/scripts/centos/cleanup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index cb79a25ec..a111947cf 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -4,6 +4,9 @@ yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm +# BENTO-94: PAM unable to dlopen(/lib64/security/pam_fprintd.so) +authconfig --disablefingerprint --update + # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 From 76062cb56d671d63353da6d341dab5d9bcb8f95e Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 Nov 2013 23:39:29 -0500 Subject: [PATCH 2/5] Move authconfig cleanup to authconfig kickstart for CentOS/RHEL 6 --- packer/http/centos-6.4/ks.cfg | 3 +-- packer/scripts/centos/cleanup.sh | 3 --- packer/scripts/centos/ks.cfg | 5 ++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 0cbcda37d..ceeb13e4c 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -5,7 +5,6 @@ keyboard us network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled -authconfig --enableshadow --passalgo=sha512 selinux --permissive timezone UTC bootloader --location=mbr @@ -14,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -auth --useshadow --enablemd5 +auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index a111947cf..cb79a25ec 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -4,9 +4,6 @@ yum -y clean all rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? rm -f /tmp/chef*rpm -# BENTO-94: PAM unable to dlopen(/lib64/security/pam_fprintd.so) -authconfig --disablefingerprint --update - # clean up redhat interface persistence rm -f /etc/udev/rules.d/70-persistent-net.rules sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0 diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 0cbcda37d..f515ad36d 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -5,7 +5,6 @@ keyboard us network --bootproto=dhcp rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ firewall --disabled -authconfig --enableshadow --passalgo=sha512 selinux --permissive timezone UTC bootloader --location=mbr @@ -13,8 +12,8 @@ text skipx zerombr clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 +autopart +authconfig --disablefingerprint --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot From 3ecae0a3749e99b7bdba245e159363bcdb9285e9 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Thu, 7 Nov 2013 23:43:45 -0500 Subject: [PATCH 3/5] Consistently use auth in scripts/centos/ks.cfg http/centos-6.4/ks.cfg --- packer/scripts/centos/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index f515ad36d..f4a943802 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -13,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -authconfig --disablefingerprint --enableshadow --passalgo=sha512 --kickstart +auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot From 8eeadb13275c67b643671959c20d57fdc196a050 Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 8 Nov 2013 03:10:54 -0500 Subject: [PATCH 4/5] BENTO-95 Removed CentOS cleanup.sh packages for removal --- packer/http/centos-5.10/ks.cfg | 8 ++++++-- packer/http/centos-6.4/ks.cfg | 6 ++++-- packer/scripts/centos/cleanup.sh | 1 - packer/scripts/centos/ks.cfg | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packer/http/centos-5.10/ks.cfg b/packer/http/centos-5.10/ks.cfg index 089c44b39..7f3e3d8dc 100644 --- a/packer/http/centos-5.10/ks.cfg +++ b/packer/http/centos-5.10/ks.cfg @@ -22,11 +22,15 @@ reboot @Base @Core @Development Tools +kernel-devel +nfs-utils openssl-devel readline-devel zlib-devel -kernel-devel -nfs-utils +-avahi +-bluez-utils +-dogtail +-kudzu %post # update root certs diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 0cbcda37d..79ea35c72 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -22,11 +22,13 @@ reboot @Base @Core @Development Tools +kernel-devel +nfs-utils openssl-devel readline-devel zlib-devel -kernel-devel -nfs-utils +-fprintd-pam +-intltool %post # update root certs diff --git a/packer/scripts/centos/cleanup.sh b/packer/scripts/centos/cleanup.sh index cb79a25ec..9b3e37da5 100644 --- a/packer/scripts/centos/cleanup.sh +++ b/packer/scripts/centos/cleanup.sh @@ -1,5 +1,4 @@ #!/bin/bash -eux -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 diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index 0cbcda37d..79ea35c72 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -22,11 +22,13 @@ reboot @Base @Core @Development Tools +kernel-devel +nfs-utils openssl-devel readline-devel zlib-devel -kernel-devel -nfs-utils +-fprintd-pam +-intltool %post # update root certs From 8d4bdaa263148f572e68dc3fe6d7b553d40163fd Mon Sep 17 00:00:00 2001 From: Brian Flad Date: Fri, 8 Nov 2013 03:24:49 -0500 Subject: [PATCH 5/5] BENTO-94 CentOS auth --disablefingerprint is extraneous with removal of fprintd-pam package in kickstart --- packer/http/centos-6.4/ks.cfg | 2 +- packer/scripts/centos/ks.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packer/http/centos-6.4/ks.cfg b/packer/http/centos-6.4/ks.cfg index 2e9555007..86268a4bf 100644 --- a/packer/http/centos-6.4/ks.cfg +++ b/packer/http/centos-6.4/ks.cfg @@ -13,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart +auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot diff --git a/packer/scripts/centos/ks.cfg b/packer/scripts/centos/ks.cfg index f85eff55a..8945775ba 100644 --- a/packer/scripts/centos/ks.cfg +++ b/packer/scripts/centos/ks.cfg @@ -13,7 +13,7 @@ skipx zerombr clearpart --all --initlabel autopart -auth --disablefingerprint --enableshadow --passalgo=sha512 --kickstart +auth --enableshadow --passalgo=sha512 --kickstart firstboot --disabled reboot