From af4b5e8120b51726ae8e68b639e52ac9869583b4 Mon Sep 17 00:00:00 2001
From: "John P. Davis" <zhen@gentoo.org>
Date: Wed, 29 Sep 2004 06:44:26 +0000
Subject: [PATCH] bugfix #60502 - the stage2 target can now resume the
 bootstrapping process

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@442 d1e1f19c-881f-0410-ab34-b69fee027534
---
 ChangeLog                       |  5 ++++-
 targets/stage2/stage2-chroot.sh | 12 +++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2caa1684..4433046b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.85 2004/09/29 01:32:50 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.86 2004/09/29 06:44:26 zhen Exp $
+
+  29 Sep 2004; John Davis <zhen@gentoo.org> targets/stage2/stage2-chroot.sh:
+  bugfix #60502 - the stage2 target can now resume the bootstrapping process
 
   28 Sep 2004; John Davis <zhen@gentoo.org> TODO,
   +examples/fsscript.sh.example, examples/livecd-stage2_template.spec,
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index 5a2aaa6f..b1c7975d 100755
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.5 2004/08/02 23:23:34 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.6 2004/09/29 06:44:26 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -26,20 +26,14 @@ fi
 										
 if [ -n "${clst_PKGCACHE}" ]
 then
-	export EMERGE_OPTS="--usepkg --buildpkg"
+	export bootstrap_opts="-r"
 fi
 
 GRP_STAGE23_USE="$(source /etc/make.profile/make.defaults ; echo ${GRP_STAGE23_USE})"
 
-if [ -f /usr/portage/profiles/${clst_profile}/parent ]
-then
-	export clst_bootstrap="bootstrap-cascade.sh"
-else
-	export clst_bootstrap=bootstrap.sh
-fi
 
 ## setup the environment
 export FEATURES="${clst_myfeatures}"
 
 ## START BUILD
-/usr/portage/scripts/${clst_bootstrap} || exit 1
+/usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
-- 
2.26.2