Change moving the VDB until after we have processed unmerge by moving it from livecdf...

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

diff --git a/ChangeLog b/ChangeLog
index 81ce3355bcfd9cec0d0718b9e24e136326593e19..348d2fcb312e62899e2ce214f8137302db4e7979 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh, targets/support/unmerge.sh:
+  Change moving the VDB until after we have processed unmerge by moving it
+  from livecdfs-update.sh to unmerge.sh, instead. This allows someone to
+  unmerge packages from the gentoo-release-livecd target.
+
   12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/kmerge.sh:
   Commented out the package.provided code in catalyst that seemed to cause

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 9c982421c0146cd853f45130ab8ceed70fdf0f2a..26ef2232287795848ddc45b5029fc752e1223380 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -340,14 +340,10 @@ 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
 
                # This gives us a proper cache for portage/installer
                tar cjf /usr/livecd/metadata.tar.bz2 /var/cache/edb/dep/usr/portage
 
-               # We remove kernel sources from our vdb
-               rm -rf /usr/livecd/db/pkg/sys-kernel/*sources*
-
                # Clear out lastlog
                rm -f /var/log/lastlog && touch /var/log/lastlog
 

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index d88db5f4f992cb55173087c7bb12f079004d93d1..3f65362468f0163f18476440f6ae7008ad55f033 100644 (file)
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -1,4 +1,4 @@
-
+#!/bin/bash
 
 source /tmp/chroot-functions.sh
 
@@ -6,4 +6,8 @@ update_env_settings
 
 run_emerge -C ${clst_packages}
 
+case ${clst_livecd_type} in
+       gentoo-release-livecd ) mv -f /var/db /usr/livecd ;;
+esac
+
 exit 0