From 2038f7bc54ca9ac9d13f471d74de55531cb68b68 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Fri, 16 Nov 2007 21:56:15 +0000 Subject: [PATCH] move moving of /var/db back to livecdfs-update.sh but keep the symlink so we can unmerge git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1257 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ targets/support/livecdfs-update.sh | 3 +++ targets/support/unmerge.sh | 5 ----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4db62d3d..d7784111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 16 Nov 2007; Andrew Gaffney + targets/support/livecdfs-update.sh, targets/support/unmerge.sh: + move moving of /var/db back to livecdfs-update.sh but keep the symlink so we + can unmerge + 13 Nov 2007; Chris Gianelloni catalyst, targets/support/livecdfs-update.sh, targets/support/unmerge.sh: Removing old mkvardb code which is no longer used, commenting out setting of diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 2c1a27f0..0c502562 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -329,6 +329,9 @@ case ${clst_livecd_type} in cp -r /usr/portage/eclass /usr/livecd rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} mv -f /etc/gconf /usr/livecd + mv -f /var/db /usr/livecd + # We keep the symlink so that you can still unmerge stuff + ln -sf /usr/livecd/db /var/db # This gives us a proper cache for portage/installer tar cjf /usr/livecd/metadata.tar.bz2 /var/cache/edb/dep/usr/portage diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh index 7e737d1d..43aefd0b 100644 --- a/targets/support/unmerge.sh +++ b/targets/support/unmerge.sh @@ -6,9 +6,4 @@ update_env_settings run_emerge -C ${clst_packages} -if [ "${clst_livecd_type}" == "gentoo-release-livecd" ] -then - mv -f /var/db /usr/livecd -fi - exit 0 -- 2.26.2