From 9044f7b61534f47e2d37c0ad201a5710cd3aa4d4 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 7 Dec 2005 21:57:59 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@944 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 ++++++++- targets/livecd-stage2/unmerge.sh | 8 +------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index caa420a4..d6836993 100644 --- 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 + 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 catalyst, targets/livecd-stage1/livecd-stage1-chroot.sh, diff --git a/targets/livecd-stage2/unmerge.sh b/targets/livecd-stage2/unmerge.sh index e6712bd9..4c98a58a 100644 --- 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 -- 2.26.2