Removed profiles hack from livecd-stage2's unmerge, since it isn't used anymore and...

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

diff --git a/ChangeLog b/ChangeLog
index caa420a4f7b007569762be878bed30e1d45bbbdd..d68369937f4c89845fbeb4cb398926ebc19b6f9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.431 2005/12/07 21:33:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.432 2005/12/07 21:57:59 wolf31o2 Exp $
+
+  07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/unmerge.sh:
+  Removed profiles hack from livecd-stage2's unmerge, since it isn't used
+  anymore and probably should have been removed a long time ago when the new
+  code was put into place in livecdfs-update.sh and livecd-local.start
+  instead.
 
   07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/livecd-stage1/livecd-stage1-chroot.sh,

diff --git a/targets/livecd-stage2/unmerge.sh b/targets/livecd-stage2/unmerge.sh
index e6712bd9a22dbd34b43faa10dd1f1a1f717f4a31..4c98a58ae31e221741ef34aa0e1bf0fc28f47a5b 100644 (file)
--- a/targets/livecd-stage2/unmerge.sh
+++ b/targets/livecd-stage2/unmerge.sh
@@ -1,15 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/unmerge.sh,v 1.9 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/unmerge.sh,v 1.10 2005/12/07 21:57:59 wolf31o2 Exp $
 
 ${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF
        EMERGE_WARNING_DELAY=0 emerge -C $*
 EOF
 
-if [ -d /usr/livecd/profiles ]
-then
-       mkdir -p /usr/portage/profiles
-       ln -sf /usr/livecd/profiles /usr/portage/profiles
-fi
-
 exit 0