move moving of /var/db back to livecdfs-update.sh but keep the symlink so we can...

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

diff --git a/ChangeLog b/ChangeLog
index 4db62d3d34c66d8c2b4dbc40a8ec986352f8186a..d778411155f8adfc6b35ac5e6ad8f763292b79f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  16 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
+  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 <wolf31o2@gentoo.org> 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 2c1a27f0119d4f816c063ec55a0672cd7ec7aced..0c5025629198acfece92a37fbc12923ac32d825a 100755 (executable)
--- 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 7e737d1d3ca2031467973cf90bf4d84a9c92d990..43aefd0be94564227a51fc01c200965f331a20ab 100644 (file)
--- 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