create symlink for /etc/gconf and /var/db when moving to /usr/livecd

remove preservation of eclasses/profiles
remove copying of livecd-local.start since it's not needed anymore

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

diff --git a/ChangeLog b/ChangeLog
index d778411155f8adfc6b35ac5e6ad8f763292b79f2..829e0bc7e490177534cb12355a3067a3d0654d25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/livecdfs-update.sh:
+  create symlink for /etc/gconf and /var/db when moving to /usr/livecd
+  remove preservation of eclasses/profiles
+  remove copying of livecd-local.start since it's not needed anymore
+
   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

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index b1649f57e4a2f9dbcba495422777d901018ad949..f8fdf2172a1e3f869c9d4a736287415ad20ce390 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -64,8 +64,8 @@ case $1 in
                        ${clst_chroot_path}/root/.bashrc
                cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \
                        ${clst_chroot_path}/root/.bash_profile
-               cp -f ${clst_sharedir}/livecd/files/livecd-local.start \
-                       ${clst_chroot_path}/etc/conf.d/local.start
+#              cp -f ${clst_sharedir}/livecd/files/livecd-local.start \
+#                      ${clst_chroot_path}/etc/conf.d/local.start
                
                # execute copy gamecd.conf if we're a gamecd
                if [ "${clst_livecd_type}" = "gentoo-gamecd" ]

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 0c5025629198acfece92a37fbc12923ac32d825a..741be3474e6c0391f261e0f06d90014204f935e7 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -325,12 +325,12 @@ case ${clst_livecd_type} in
                USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
 
                # This is my hack to reduce tmpfs usage
-               cp -r /usr/portage/profiles /usr/livecd
-               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*}
+#              cp -r /usr/portage/profiles /usr/livecd
+#              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
+               ln -sf /usr/livecd/gconf /etc/gconf
                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
@@ -371,7 +371,13 @@ case ${clst_livecd_type} in
        generic-livecd )
                # This is my hack to reduce tmpfs usage
                mkdir -p /usr/livecd
-               [ -d /etc/gconf ] && mv -f /etc/gconf /usr/livecd
+
+               if [ -d /etc/gconf ]
+               then
+                       mv -f /etc/gconf /usr/livecd
+                       ln -sf /usr/livecd/gconf /etc/gconf
+               fi
+
                if [ -e /usr/livecd/kernelpkgs.txt ]
                then
                        rm -f /usr/livecd/kernelpkgs.txt