[gentoo-commits] proj/catalyst:master commit in: /, targets/support/

["Matt Turner" <mattst88@gmail.com>]

commit:     11a7b5cb09e2d7b7f4f88496fc7816a7cad030d4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 17:02:22 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Jun 26 17:02:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=11a7b5cb

chroot-functions.sh: emerge sys-apps/shadow before distcc

distcc uses 'useradd' and will fail in stage2 without shadow.

---
 ChangeLog                           |    4 ++++
 targets/support/chroot-functions.sh |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 965171a..8130862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 
   26 Jun 2011; Matt Turner <mattst88@gentoo.org>
   targets/support/chroot-functions.sh:
+  Emerge sys-apps/shadow before distcc
+
+  26 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  targets/support/chroot-functions.sh:
   Don't run 'distcc-config --install'
 
   25 Jun 2011; Sebastian Pipping <sping@gentoo.org>

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 638ef67..4e707d2 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -72,18 +72,19 @@ setup_myfeatures(){
 		export clst_myfeatures="${clst_myfeatures} distcc"
 		export DISTCC_HOSTS="${clst_distcc_hosts}"
 		[ -e /etc/make.conf ] && \
-			echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf
+			echo 'USE="${USE} -avahi -gtk -gnome -cracklib -pam"' >> /etc/make.conf
 		# We install distcc to / on stage1, then use --noreplace, so we need to
 		# have some way to check if we need to reinstall distcc without being
 		# able to rely on USE, so we check for the distcc user and force a
 		# reinstall if it isn't found.
 		if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
 		then
+			clst_root_path=/ run_merge --oneshot --nodeps sys-apps/shadow || exit 1
 			clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
 		else
 			clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
 		fi
-		sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
+		sed -i '/USE="${USE} -avahi -gtk -gnome -cracklib -pam"/d' /etc/make.conf
 		mkdir -p /etc/distcc
 		echo "${clst_distcc_hosts}" > /etc/distcc/hosts