finished stackable profiles support

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@336 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 51fc033e6a07489723272a309419978a1bab1d08..509b8ea26d88b1111df4214622a3ab0bf50bdb93 100644 (file)
--- 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.30 2004/03/31 15:18:43 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.31 2004/03/31 21:56:23 zhen Exp $
+
+  31 Mar 2004; John Davis <zhen@gentoo.org> targets/stage2/stage2.sh:
+  added support to the stage2 for stackable profiles bootstrap
 
   31 Mar 2004; John Davis <zhen@gentoo.org> arch/sparc.py, modules/targets.py:
   sparc compatibility patches from gustavoz@gentoo.org added. These patches add

diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh
index 1311752b9832d06cef2f977873ae08de1f9c8cdf..83530f1a5e5a8bb82bcef26e080289d28108808c 100755 (executable)
--- a/targets/stage2/stage2.sh
+++ b/targets/stage2/stage2.sh
@@ -1,6 +1,6 @@
 # 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/Attic/stage2.sh,v 1.9 2004/03/26 17:03:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.10 2004/03/31 21:56:23 zhen Exp $
 
 case $1 in
 enter)
@@ -36,7 +36,13 @@ run)
        then
                export EMERGE_OPTS="--usepkg --buildpkg"
        fi
-       /usr/portage/scripts/bootstrap.sh || exit 1
+       if [ -f /usr/portage/profiles/${clst_profile}/parent ]
+    then
+       export clst_bootstrap="bootstrap-cascade.sh"
+    else
+       export clst_bootstrap=bootstrap.sh
+    fi
+       /usr/portage/scripts/\${clst_bootstrap} || exit 1
 EOF
        [ $? -ne 0 ] && exit 1 
        ;;