aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2011-07-13 20:45:02 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2011-07-13 20:45:02 -0500
commitb40988d66fbecca24c21634267131b89f178fca7 (patch)
tree913754229b33fdd7afc627bac1ffb8a7ec7e46f4
parentAdd /etc/init.d/fixinittab to the default runlevel - fix autologin on the ins... (diff)
downloadcatalyst-b40988d66fbecca24c21634267131b89f178fca7.tar.gz
catalyst-b40988d66fbecca24c21634267131b89f178fca7.tar.bz2
catalyst-b40988d66fbecca24c21634267131b89f178fca7.zip
Revert "chroot-functions.sh: emerge sys-apps/shadow before distcc"
This reverts commit 11a7b5cb09e2d7b7f4f88496fc7816a7cad030d4. We do not need this now since shadow is part of stage 1.
-rw-r--r--ChangeLog4
-rw-r--r--targets/support/chroot-functions.sh5
2 files changed, 2 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8130862..965171a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,10 +5,6 @@
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 4e707d2..638ef67 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -72,19 +72,18 @@ setup_myfeatures(){
export clst_myfeatures="${clst_myfeatures} distcc"
export DISTCC_HOSTS="${clst_distcc_hosts}"
[ -e /etc/make.conf ] && \
- echo 'USE="${USE} -avahi -gtk -gnome -cracklib -pam"' >> /etc/make.conf
+ echo 'USE="${USE} -avahi -gtk -gnome"' >> /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 -cracklib -pam"/d' /etc/make.conf
+ sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
mkdir -p /etc/distcc
echo "${clst_distcc_hosts}" > /etc/distcc/hosts