Changed to clst_use from clst_stage4_use and clst_livecd_use.

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

diff --git a/ChangeLog b/ChangeLog
index e1da668923e64bb93d1ee8201ae5f9be648089de..d9a6ce089ca0fe6fc75be20e1e8c4d44cb829021 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.402 2005/11/29 19:59:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.403 2005/11/29 20:15:48 wolf31o2 Exp $
+
+  29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/stage4/stage4-chroot.sh:
+  Changed to clst_use from clst_stage4_use and clst_livecd_use.
 
   29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage4/stage4-chroot.sh:

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 08fd420d6404a6e6f7225f870aceb0af89efa2d3..51c7df48696de3ec19d184226e7dae87e300593b 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.18 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.19 2005/11/29 20:15:48 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -21,6 +21,6 @@ setup_portage
 
 #turn off auto-use:
 export USE_ORDER="env:pkg:conf:defaults"       
-export USE="${clst_livecd_use}"
+export USE="${clst_use}"
 
 run_emerge "${clst_packages}"

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 47a9c8795f2d93160e37ea1b10a68280451bde90..4f9ad284bcb4e50f0f98c21d31c3557c3bb32950 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -25,11 +25,11 @@ run_emerge -u system
 
 
 echo "Emerging packages using stage4 use flags"
-if [ -n "${clst_stage4_use}" ]
+if [ -n "${clst_use}" ]
 then 
        export USE="${USE} ${clst_HOSTUSE}"
 else   
-       USE="${clst_stage4_use}"
+       USE="${clst_use}"
 fi
 
 run_emerge "${clst_packages}"