From a4968878f0bf3bf32e0c5fb0c4b6d88a0ebb8084 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 26 Jun 2011 13:02:22 -0400 Subject: [PATCH] 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 b6df4d53..0e1b89fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ # Distributed under the GPL v2 # $Id$ + 26 Jun 2011; Matt Turner + targets/support/chroot-functions.sh: + Emerge sys-apps/shadow before distcc + 26 Jun 2011; Matt Turner targets/support/chroot-functions.sh: Don't run 'distcc-config --install' diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index e739f0aa..0b81e657 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 -- 2.26.2